Regenerate translations

[github/Chocobozzz/PeerTube.git] / client / src / locale / angular.sv-SE.xlf

diff --git a/client/src/locale/angular.sv-SE.xlf b/client/src/locale/angular.sv-SE.xlf
index 679cee73f3f07bba000aa074c3996a9cfb9e7a42..a27560ec29a94c51f77f828274c321bdc3f4a7a5 100644 (file)
--- a/client/src/locale/angular.sv-SE.xlf
+++ b/client/src/locale/angular.sv-SE.xlf
@@ -128,7 +128,7 @@
         <context-group purpose="location"><context context-type="sourcefile">node_modules/@ng-bootstrap/ng-bootstrap/pagination/pagination.d.ts</context><context context-type="linenumber">53</context></context-group>
       </trans-unit>
       <trans-unit id="ngb.progressbar.value">
-        <source><x id="INTERPOLATION" equiv-text="{{getPercentValue()}}"/>%</source>
+        <source><x id="INTERPOLATION" equiv-text="{{getValue() / max | percent}}"/></source>
         <target><x id="INTERPOLATION" equiv-text="{{getPercentValue()}}"/>&amp;nbsp;%</target>
         <context-group name="null">
           <context context-type="linenumber">6</context>
@@ -255,89 +255,150 @@
         </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="translated">Kanalens profilbild</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/account/avatar.component.html</context><context context-type="linenumber">4</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/account/avatar.component.html</context><context context-type="linenumber">17</context></context-group></trans-unit>
+      <trans-unit id="879fef27271d8247d791381cf1f9bb0eb8974166" datatype="html">
+        <source>Account avatar</source>
+        <target state="translated">Kontots profilbild</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/account/avatar.component.html</context><context context-type="linenumber">7</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/account/avatar.component.html</context><context context-type="linenumber">13</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/account/avatar.component.html</context><context context-type="linenumber">23</context></context-group></trans-unit>
       <trans-unit id="f3e63578c50546530daf6050d2ba6f8226040f2c">
         <source>You don't have notifications.</source>
         <target>Du har inga notifikationer.</target>
         <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>
+        <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 }}"/> publicerade en ny 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>"/> </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>
+        <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">Notifikationen gäller en video som inte längre är tillgänglig</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="translated">Din 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>"/> är inte längre blockerad </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="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">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>"/> är inte längre svartlistad </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">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>"/> har svartlistats </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>"/>En anmälan om missbruk<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> har gjorts angående videon <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">Den nyligen uppladdade videon <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>"/> har <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/>svartlistats automatiskt<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>
-      </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>"/> skrev en kommentar på din 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>"/> </target>
+      <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="translated">Din 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>"/> har blockerats </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="552e90b955a7121d58f6e5a38b68c7e90f5ed90c" 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.abuse.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>
+        </source><target state="new">
+          <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.abuse.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/shared-main/users/user-notifications.component.html</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
+      </trans-unit><trans-unit id="c039b9ff89810152d8c0006979d3542a122cd286" datatype="html">
+        <source>
+          <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>A new comment 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.abuse.comment.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>
+        </source><target state="new">
+          <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>A new comment 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.abuse.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/shared-main/users/user-notifications.component.html</context>
+          <context context-type="linenumber">52</context>
+        </context-group>
+      </trans-unit><trans-unit id="bfe60e77cfae17a8719a5fb422fb7e4b2bcc83c2" datatype="html">
+        <source>
+          <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>A new account abuse<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been created on account <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.abuse.account.displayName }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>
+        </source><target state="new">
+          <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>A new account abuse<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been created on account <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/><x id="INTERPOLATION" equiv-text="{{ notification.abuse.account.displayName }}"/><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="285ef550cb17086e949266777312a1884bd7d739" datatype="html">
+        <source>
+          <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>A new abuse<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been created
+        </source><target state="new">
+          <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>A new abuse<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been created
+        </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context>
+          <context context-type="linenumber">61</context>
+        </context-group>
+      </trans-unit><trans-unit id="680ba11d9548df295024d7f8ab7b816580725d5d" datatype="html">
+        <source>
+          <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Your abuse <x id="INTERPOLATION" equiv-text="{{ notification.abuse.id }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been
+          <x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/>accepted<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>"/>rejected<x id="CLOSE_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;/ng-container>"/>
+        </source><target state="new">
+          <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Your abuse <x id="INTERPOLATION" equiv-text="{{ notification.abuse.id }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has been
+          <x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/>accepted<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>"/>rejected<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="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="3f8e1a007a869471c5ab6e9b6149165ecc26e4ad" datatype="html">
+        <source>
+          <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Abuse <x id="INTERPOLATION" equiv-text="{{ notification.abuse.id }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has a new message
+        </source><target state="new">
+          <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Abuse <x id="INTERPOLATION" equiv-text="{{ notification.abuse.id }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> has a new message
+        </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context>
+          <context context-type="linenumber">79</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="translated">Den nyss uppladdade videon <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>"/> har <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/>blockerats automatiskt<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">87</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>"/> skrev en kommentar på din 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>"/> </target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">100</context></context-group></trans-unit>
       <trans-unit id="4d2311a5156bd322cc7e2ebafcf6063ba8232e63" datatype="html">
         <source>The notification concerns a comment now unavailable</source>
         <target state="translated">Notifikationen gäller en kommentar som inte längre är tillgänglig</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">108</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">Din 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>"/> har publicerats </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">117</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>"/>Din videoimport<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> <x id="INTERPOLATION" equiv-text="{{ notification.videoImportIdentifier }}"/> lyckades </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">125</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>"/>Din videoimport<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> <x id="INTERPOLATION" equiv-text="{{ notification.videoImportIdentifier }}"/> misslyckades </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">133</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">Användaren <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>"/> skapade ett konto på din instans </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">141</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,41 +407,43 @@
           <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>"/> följer <x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/>din kanal <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>"/>ditt konto<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">151</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>"/> nämnde dig i en kommentar till videon <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">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">164</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">Din instans har <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>en ny följare<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>"/> som inväntar ditt godkännande<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">172</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">Din instans började följa <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>"/> automatiskt </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">181</context></context-group></trans-unit>
       <trans-unit id="f61b49d5729bbd138f2a083fbaee2920811d31c5" datatype="html">
         <source>The notification points to a content now unavailable</source>
         <target state="translated">Notifikationen berör någonting som inte finns tillgängligt</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context><context context-type="linenumber">189</context></context-group></trans-unit>
+      <trans-unit id="3fb9a5f7268114445d8c109a8f48102e93471f5a" datatype="html">
+        <source>Change your avatar</source>
+        <target state="translated">Ändra din profilbild</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>
+        <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>
@@ -388,7 +451,7 @@
         <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>
+        <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>
@@ -398,42 +461,48 @@
         </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">49</context></context-group></trans-unit>
       <trans-unit id="85e5d1de15d23cde43c530e3740a2a61aed24c2d">
         <source>Start at</source>
         <target>Börja vid</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/report-modals/video-report.component.html</context><context context-type="linenumber">47</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>Sluta vid</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>
-      </trans-unit>
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/video-report.component.html</context><context context-type="linenumber">62</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="translated">Din anmälan kommer skickas till moderatorerna på <x id="INTERPOLATION" equiv-text="{{ currentHost }}"/><x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/> samt vidarebefordras till videons ursprungsvärd (<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/shared-moderation/report-modals/video-report.component.html</context><context context-type="linenumber">74</context></context-group></trans-unit>
+      <trans-unit id="04f47b9519b96ac834a111c0e113d18c77d177de" datatype="html">
+        <source>Please describe the issue...</source>
+        <target state="translated">Beskriv problemet …</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/video-report.component.html</context><context context-type="linenumber">80</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/report.component.html</context><context context-type="linenumber">42</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/report.component.html</context><context context-type="linenumber">42</context></context-group></trans-unit>
       <trans-unit id="8efba03f22550a671ee2c2c6dfd1ff03ea047700" datatype="html">
         <source>Search playlists</source>
         <target state="translated">Sök bland spellistor</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>
+        <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">Skapa en privat spellista</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>
+        <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>
@@ -441,12 +510,12 @@
         <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/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/+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">
@@ -455,49 +524,45 @@
         <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/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>
+        <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">video</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">undertexter</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>
+        <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">Format</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>
+        <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>
+        <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">Videoström</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>
+        <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">Ljudström</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>
+        <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>
@@ -505,7 +570,7 @@
         <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>
+        <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>
@@ -513,7 +578,7 @@
         <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>
+        <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>
@@ -523,7 +588,7 @@
         <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>
+        <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>
@@ -531,24 +596,8 @@
         <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>Anmäl video</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">Din anmälan kommer skickas till moderatorerna på <x id="INTERPOLATION" equiv-text="{{ currentHost }}"/><x id="START_TAG_NG-CONTAINER" ctype="x-ng-container" equiv-text="&lt;ng-container>"/> samt videons ursprungsinstans (<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>
+        <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>
@@ -556,9 +605,7 @@
         <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>
+        <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>
@@ -568,7 +615,7 @@
         <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>
+        <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>
@@ -576,29 +623,30 @@
         <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>Svartlista video</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-blacklist.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/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/report-modals/video-report.component.html</context><context context-type="linenumber">95</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/report.component.html</context><context context-type="linenumber">57</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/report.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-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/+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="translated">Anmäl videon ”<x id="INTERPOLATION" equiv-text="{{ video.name }}"/>”</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/video-report.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="translated">Vad är problemet?</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/video-report.component.html</context><context context-type="linenumber">13</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/report.component.html</context><context context-type="linenumber">13</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/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">Fjärrinstansen kommer ombes ta bort den</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>
+        <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">Upphör federera videon</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>
+        <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>
@@ -606,8 +654,8 @@
         <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>
+        <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>
@@ -615,23 +663,20 @@
         <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>
+        <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 visning} other {<x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> visningar} }</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>Svartlistad</target>
-        <context-group name="null">
-          <context context-type="linenumber">42</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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.html</context><context context-type="linenumber">31</context></context-group></trans-unit>
+      <trans-unit id="1d3781d7296d4b4e04e7f023aec1052fb2955c4d" datatype="html">
+        <source>Blocked</source>
+        <target state="translated">Blockerad</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-video-miniature/video-miniature.component.html</context><context context-type="linenumber">51</context></context-group></trans-unit>
       <trans-unit id="fb8ccb136ab0ad1ff1dfbce739198be16a814f87">
         <source>Sensitive</source>
         <target>
@@ -640,15 +685,15 @@
         <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">55</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 {Inga videor} =1 {1 video} other {<x id="INTERPOLATION" equiv-text="{{ playlist.videosLength }}"/> videor} }</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>
+        <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>
@@ -658,15 +703,15 @@
         <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>
+        <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>Uppdaterades för <x id="INTERPOLATION" equiv-text="{{ playlist.updatedAt | myFromNow }}"/></target>
+        <target>Uppdaterades <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>
+        <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">
         <source>Unavailable</source>
@@ -674,7 +719,7 @@
         <context-group name="null">
           <context context-type="linenumber">32</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">32</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">32</context></context-group>
       </trans-unit>
       <trans-unit id="28df1b02fd88d2deb0212bc5d7ff34cf9492fa54">
         <source>Deleted</source>
@@ -685,14 +730,14 @@
         
         
         
-      <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/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">109</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">56</context></context-group></trans-unit>
       <trans-unit id="2edccfda908b57c073dc0811eaa58818de2be2dc">
         <source>Edit starts/stops at</source>
         <target>Redigera start- och sluttid</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>
+        <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>
@@ -700,9 +745,9 @@
         <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/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">
@@ -711,7 +756,7 @@
         <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>
+        <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>
@@ -719,16 +764,16 @@
         <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">32</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">32</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">32</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">32</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">32</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">32</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">32</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>Ta bort</target>
@@ -739,33 +784,33 @@
         
         
         
-      <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/+my-account/my-account-videos/my-account-videos.component.html</context><context context-type="linenumber">31</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>Redigera</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/+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">88</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">88</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>Kort förhandsvisning</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>
+        <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>
@@ -773,7 +818,7 @@
         <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>
+        <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>
@@ -781,15 +826,12 @@
         <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>
+        <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">Rekommenderas</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>
+        <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>
@@ -797,15 +839,12 @@
         <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>
+        <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">Prenumerera med ett konto på den här instansen</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>
+        <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>
@@ -813,7 +852,7 @@
         <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>
+        <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>
@@ -821,7 +860,7 @@
         <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>
+        <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>
@@ -829,7 +868,7 @@
         <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>
+        <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>
@@ -837,7 +876,15 @@
         <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>
+        <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="3e486bad6576aa445ccb6051069e45a3658e4160" datatype="html">
+        <source>PROFILE SETTINGS</source>
+        <target state="translated">PROFILINSTÄLLNINGAR</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">12</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="4913054c95f5ba14c351ab1b787f7abac97bfdd3">
         <source>
@@ -851,7 +898,7 @@
         <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>
+        <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">
         <source>
@@ -865,7 +912,7 @@
         <context-group name="null">
           <context context-type="linenumber">17</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">17</context></context-group>
+        <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>
@@ -873,18 +920,12 @@
         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">Du kan interagera med det här från vilken instans som helst i Fediversumet som har stöd för ActivityPub.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> På instanser av Mastodon och Pleroma kan du klistra in den här sidans adress i sökrutan för att interagera därifrån. </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>
+        <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">PeerTube-version</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>
+        <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">
         <source>
@@ -898,7 +939,7 @@
         <context-group name="null">
           <context context-type="linenumber">5</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">11</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">12</context></context-group>
       </trans-unit>
       <trans-unit id="87ca23d62c168409ed040dae83dd8717cae3f08c">
         <source>User registration allowed</source>
@@ -906,7 +947,7 @@
         <context-group name="null">
           <context context-type="linenumber">14</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">20</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">21</context></context-group>
       </trans-unit>
       <trans-unit id="62c8c98c3957946709b49d0a5e309e53e660b9e2">
         <source>Video uploads</source>
@@ -914,8 +955,8 @@
         <context-group name="null">
           <context context-type="linenumber">32</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">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>
+        <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">
         <source>Transcoding in multiple resolutions</source>
@@ -923,23 +964,17 @@
         <context-group name="null">
           <context context-type="linenumber">25</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">31</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">32</context></context-group>
       </trans-unit>
       <trans-unit id="7deebcf3491b27625e9b308179a6635b48368dcb" datatype="html">
         <source>Requires manual validation by moderators</source>
         <target state="translated">Kräver manuellt godkännande av en moderator</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>
+        <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">Publicerad automatiskt</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>
+        <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>
@@ -947,7 +982,7 @@
         <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/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>
@@ -959,7 +994,7 @@
         <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>
+        <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>
@@ -967,9 +1002,9 @@
         <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>
+        <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">
         <source>HTTP import (YouTube, Vimeo, direct URL...)</source>
@@ -977,7 +1012,7 @@
         <context-group name="null">
           <context context-type="linenumber">64</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">70</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">71</context></context-group>
       </trans-unit>
       <trans-unit id="4e231a74ad4739e7b0606e8e66d5a656f5855a5a">
         <source>Torrent import</source>
@@ -985,7 +1020,7 @@
         <context-group name="null">
           <context context-type="linenumber">71</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">77</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">78</context></context-group>
       </trans-unit>
       <trans-unit id="59bdc3dfa4075f92c734588899485db702c8f120">
         <source>Player</source>
@@ -993,7 +1028,7 @@
         <context-group name="null">
           <context context-type="linenumber">79</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">85</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">86</context></context-group>
       </trans-unit>
       <trans-unit id="af80f4182e09341958e8706bd2b47ece61233eb5">
         <source>P2P enabled</source>
@@ -1001,7 +1036,7 @@
         <context-group name="null">
           <context context-type="linenumber">83</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">89</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">90</context></context-group>
       </trans-unit>
       <trans-unit id="b8b6a001cca6fa2ba15600ca3a78dfeebf685d60">
         <source>Loading instance statistics...</source>
@@ -1009,7 +1044,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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>
@@ -1017,7 +1052,7 @@
         <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/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">
@@ -1026,7 +1061,7 @@
         <context-group name="null">
           <context context-type="linenumber">11</context>
         </context-group>
-        <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>
+        <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">
         <source>videos</source>
@@ -1034,8 +1069,8 @@
         <context-group name="null">
           <context context-type="linenumber">65</context>
         </context-group>
-        <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>
+        <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">
         <source>video views</source>
@@ -1043,7 +1078,7 @@
         <context-group name="null">
           <context context-type="linenumber">31</context>
         </context-group>
-        <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>
+        <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">
         <source>video comments</source>
@@ -1051,8 +1086,8 @@
         <context-group name="null">
           <context context-type="linenumber">75</context>
         </context-group>
-        <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>
+        <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">
         <source>of hosted video</source>
@@ -1060,7 +1095,7 @@
         <context-group name="null">
           <context context-type="linenumber">51</context>
         </context-group>
-        <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>
+        <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">
         <source>Federation</source>
@@ -1068,7 +1103,7 @@
         <context-group name="null">
           <context context-type="linenumber">58</context>
         </context-group>
-        <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>
+        <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">
         <source>followers</source>
@@ -1076,7 +1111,7 @@
         <context-group name="null">
           <context context-type="linenumber">85</context>
         </context-group>
-        <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>
+        <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">
         <source>following</source>
@@ -1084,7 +1119,7 @@
         <context-group name="null">
           <context context-type="linenumber">95</context>
         </context-group>
-        <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>
+        <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>
@@ -1092,7 +1127,7 @@
         <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>
+        <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>
@@ -1102,7 +1137,7 @@
         <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>
+        <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>
@@ -1110,27 +1145,43 @@
         <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/report-modals/video-report.component.html</context><context context-type="linenumber">92</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/shared/shared-moderation/report-modals/report.component.html</context><context context-type="linenumber">54</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/report.component.html</context><context context-type="linenumber">54</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-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>Blockera den här användaren</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="translated">Blockera videon ”<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="translated">Orsak …</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>
@@ -1138,9 +1189,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/shared/shared-main/misc/top-menu-dropdown.component.html</context><context context-type="linenumber">14</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/misc/top-menu-dropdown.component.html</context><context context-type="linenumber">24</context></context-group></trans-unit>
       <trans-unit id="12910217fdcdbca64bee06f511639b653d5428ea">
         <source>Login</source>
         <target>
@@ -1149,23 +1200,17 @@
         <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>
+        <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">Någonting gick fel med den externa inloggningen. Kontakta gärna <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>en administratör<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>
+        <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">Om du letar efter ett konto …</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.html</context>
-          <context context-type="linenumber">12</context>
-        </context-group>
+        <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>
@@ -1177,10 +1222,7 @@
         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">Den här instansen inte registrering av nya användare tillåter för tillfället, men du kan hitta en instans att skapa ett konto och ladda dina videor till. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>Hitta din instans bland många andra på <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>joinpeertube.org<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>
+        <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>
@@ -1188,8 +1230,8 @@
         <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>
+        <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>
@@ -1197,8 +1239,8 @@
         <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>
+        <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>
@@ -1206,15 +1248,12 @@
         <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>
+        <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">eller skapa ett konto</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.html</context>
-          <context context-type="linenumber">40</context>
-        </context-group>
+        <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>
@@ -1222,19 +1261,19 @@
         <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>
+        <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">Klicka här för att återställa ditt lösenord</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">57</context></context-group>
+        <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>
@@ -1242,16 +1281,13 @@
         <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>
+        <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">Eller logga in med</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.html</context>
-          <context context-type="linenumber">68</context>
-        </context-group>
+        <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>
@@ -1259,7 +1295,7 @@
         <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>
+        <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">
         <source>We are sorry, you cannot recover your password because your instance administrator did not configure the PeerTube email system.</source>
@@ -1269,7 +1305,7 @@
         <context-group name="null">
           <context context-type="linenumber">65</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">90</context></context-group>
+        <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>
@@ -1277,23 +1313,23 @@
         <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/+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>E-postadress</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>
+        <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>
@@ -1301,7 +1337,31 @@
         <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="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>
+      <trans-unit id="26b0b148ff87e083300fa9ca213f8ada7fa6211d" datatype="html">
+        <source>on this instance</source>
+        <target state="translated">på den här instansen</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="translated">i hela videofederationen</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>
@@ -1311,7 +1371,7 @@
         <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>
+        <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>
@@ -1319,7 +1379,7 @@
         <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>
+        <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>
@@ -1327,7 +1387,7 @@
         <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>
+        <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>
@@ -1335,15 +1395,7 @@
         <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>
+        <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>
@@ -1353,7 +1405,7 @@
         <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>
+        <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>
@@ -1367,7 +1419,7 @@
         <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>
+        <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>
@@ -1377,7 +1429,7 @@
         <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>
+        <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>
@@ -1385,8 +1437,8 @@
         <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">60</context></context-group></trans-unit>
       <trans-unit id="5cf92a1d527e65908c75633e8484cdd3b6d16b9b">
         <source>Welcome to PeerTube, dear administrator!</source>
         <target>Välkommen till PeerTube, kära administratör!</target>
@@ -1455,24 +1507,20 @@
         <context-group name="null">
           <context context-type="linenumber">41</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">41</context></context-group>
+        <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">PeerTubesofficiella webbplats (nyheter, support, att bidraga …): <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>
+        <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">
         <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>Lägg till din instans i PeerTubes offentliga 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>"/>
-          </target>
+        <target>Lägg till din instans i PeerTubes offentliga register: <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 name="null">
           <context context-type="linenumber">47</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">47</context></context-group>
+        <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">
         <source>It's time to configure your instance!</source>
@@ -1480,7 +1528,7 @@
         <context-group name="null">
           <context context-type="linenumber">59</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">59</context></context-group>
+        <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">
         <source>
@@ -1496,7 +1544,7 @@
         <context-group name="null">
           <context context-type="linenumber">61</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">61</context></context-group>
+        <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>
@@ -1507,10 +1555,7 @@
           PeerTube instance.
         </source>
         <target state="translated">Om du vill öppna för kontoregistrering, ber vi dig fundera över <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>dina riktlinjer för moderering<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>, skriva ner <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>villkor för instansen<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> samt ange vilka språk du talar och kategorier som stöds. På så vis kan du hjälpa användare att skapa sina konton på <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>en passande<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> PeerTube-instans. </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>
+        <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">
         <source>Remind me later</source>
@@ -1518,7 +1563,7 @@
         <context-group name="null">
           <context context-type="linenumber">79</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">80</context></context-group>
+        <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">
         <source>Configure my instance</source>
@@ -1528,7 +1573,7 @@
         <context-group name="null">
           <context context-type="linenumber">82</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/modal/welcome-modal.component.html</context><context context-type="linenumber">86</context></context-group>
+        <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">
         <source>Configuration warning!</source>
@@ -1538,13 +1583,13 @@
         </context-group>
         <context-group purpose="location"><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">
-        <source>Hello dear administrator. You enabled user registration on your instance but you did not configure the following fields:</source>
-        <target>Hallå, kära administrator. Du aktiverade registrering på din instans men har inte uppgett följande uppgifter:</target>
-        <context-group name="null">
+      <trans-unit id="e30fd615e98eb6ebc28346024a89f00192a98396" datatype="html">
+        <source>You enabled user registration on your instance but did not configure the following fields:</source>
+        <target state="translated">Du har aktiverat användarregistrering på din instans men har inte fyllt i följande uppgifter:</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>
-        <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">
         <source>Instance name</source>
@@ -1601,35 +1646,25 @@
           <context context-type="linenumber">21</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">21</context></context-group>
-      </trans-unit><trans-unit id="565e31173ab0ea2c00c311c9051c15d8896a0b80" datatype="html">
+      </trans-unit>
+      <trans-unit id="565e31173ab0ea2c00c311c9051c15d8896a0b80" datatype="html">
         <source>
       Please consider configuring these fields to help people to choose <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>the appropriate instance<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>.
       Without them, your instance may not be referenced on the <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>JoinPeerTube website<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>.
-    </source><target state="new">
-      Please consider configuring these fields to help people to choose <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>the appropriate instance<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>.
-      Without them, your instance may not be referenced on the <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>JoinPeerTube website<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>.
-    </target>
+    </source>
+        <target state="translated">Fyll gärna i de här uppgifterna för att hjälpa andra att välja en <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>passande instans<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>. Utan den här informationen kommer din instans eventuellt inte listas på <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>JoinPeerTube-webbplatsen<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>. </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modal/instance-config-warning-modal.component.html</context>
           <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
-      
-      <trans-unit id="c8e491ab57fa4f6a0d6d09b296299b6c034244ec">
-        <source>Configure these fields</source>
-        <target>Fyll i de här fälten</target>
-        <context-group name="null">
-          <context context-type="linenumber">30</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">30</context></context-group>
-      </trans-unit>
       <trans-unit id="7d438f72f9985c4d06ed4fe80c90afc2e1df34d2">
         <source>Don't show me this warning anymore</source>
         <target>Sluta visa den här varningen</target>
         <context-group name="null">
           <context context-type="linenumber">38</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>
+        <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">
         <source>Close</source>
@@ -1637,7 +1672,15 @@
         <context-group name="null">
           <context context-type="linenumber">173</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">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="translated">Åtgärda</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>
@@ -1680,29 +1723,33 @@
           <context context-type="sourcefile">src/app/menu/menu.component.html</context>
           <context context-type="linenumber">29</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="5a69be913ebcc70f300060cf1be0c7f8827159d6" datatype="html">
-        <source>Interface: <x id="INTERPOLATION" equiv-text="{{ language }}"/></source>
-        <target state="translated">Gränssnitt: <x id="INTERPOLATION" equiv-text="{{ language }}"/></target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">36</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">156</context></context-group>
-      </trans-unit>
-      <trans-unit id="e472a6eaa2a51bd4a8ac19a1cf5567add4a04ff8" datatype="html">
-        <source>Videos: <x id="INTERPOLATION" equiv-text="{{ videoLanguages.join(', ') }}"/></source>
-        <target state="translated">Videor: <x id="INTERPOLATION" equiv-text="{{ videoLanguages.join(', ') }}"/></target>
+      </trans-unit><trans-unit id="c43efa2dff95b97be0c36a65d2ada4cd594e010f" datatype="html">
+        <source>Interface:</source><target state="new">Interface:</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/menu/menu.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit><trans-unit id="a9ada5fec7ddf53a031711b025014495372627de" 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">42</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="cc37c9e1ceff31dc1227cc8c2f4bdadb2f239173" datatype="html">
-        <source>Sensitive: <x id="INTERPOLATION" equiv-text="{{ nsfwPolicy }}"/></source>
-        <target state="translated">Känsligt innehåll: <x id="INTERPOLATION" equiv-text="{{ nsfwPolicy }}"/></target>
+      </trans-unit><trans-unit id="9fe1faff741de7a4d50e520d2161209997f8224c" datatype="html">
+        <source>Sensitive:</source><target state="new">Sensitive:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/menu/menu.component.html</context>
           <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="5a69be913ebcc70f300060cf1be0c7f8827159d6" datatype="html">
+        <source>Interface: <x id="INTERPOLATION" equiv-text="{{ language }}"/></source>
+        <target state="translated">Gränssnitt: <x id="INTERPOLATION" equiv-text="{{ language }}"/></target>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">156</context></context-group></trans-unit>
+      
+      
       <trans-unit id="ee5ad4d7fed0e8fc44fa9c2d7be9265295108411" datatype="html">
         <source>Help share videos</source>
         <target state="translated">Hjälp till att sprida videor</target>
@@ -1742,15 +1789,13 @@
         <target state="translated">Genvägar</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="5c195f8d79bd19e8520c890a2513fe635529b7a7" datatype="html">
+      <trans-unit id="f8e6eaa974acec3b80e5c77ec0dc4ff80939964d" datatype="html">
         <source>powered by PeerTube</source>
         <target state="translated">drivs av 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="translated">PeerTubes webbplats</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">171</context></context-group>
+        <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>
@@ -1811,23 +1856,23 @@
         <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></trans-unit>
       <trans-unit id="efac3af0b32e953279c25b6519cae256811e0fe8">
         <source>History</source>
         <target>Historik</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></trans-unit>
       <trans-unit id="165035acb08983753bcecc3e8b6b18c7caf26d35" datatype="html">
         <source>VIDEOS</source>
         <target state="translated">VIDEOR</target>
-        <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/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>
@@ -1836,6 +1881,7 @@
           <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>
+        <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>
@@ -1876,6 +1922,7 @@
           <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>
+        <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>
@@ -1897,13 +1944,14 @@
           <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>
+        <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="translated">Markera alla som lästa</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">20</context></context-group></trans-unit>
       <trans-unit id="341e026e3f317aa3164916cc63a059c961a78b81">
         <source>Update your notification preferences</source>
         <target>Uppdatera dina notifikationsinställningar</target>
@@ -1928,49 +1976,69 @@
       <trans-unit id="90ce30ddedd5892740bb41e9ead736cd2c0f9b53" datatype="html">
         <source>GLOBAL SEARCH</source>
         <target state="translated">GLOBAL SÖKNING</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="translated">använder <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="translated">med <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="translated">Resultaten kommer kompletteras med en indexering från en utomstående tjänst. Endast data som är nödvändig för sökningen kommer skickas.</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>
+        <target state="translated">Resultaten kommer kompletteras med träffar från ett fristående register. Endast data som är nödvändig för sökningen kommer skickas.</target>
+        <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="translated">AVANCERAD SÖKNING</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="translated">alla instanser</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="translated">endast instanser som följs av den här</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="translated">Avgör om du kan hämta fjärrinnehåll eller om instansen bara tillåter det för instanser den följer.</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="translated">kanal</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="translated">Om texten inte matchar något av ovanstående kommer en lista relevanta videor och kanaler visas.</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="translated">för att söka efter en kanal</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="translated">för att söka efter en 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="translated">Om texten inte matchar något av ovanstående kommer en lista matchande videor och kanaler visas.</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>Sök …</target>
@@ -1987,40 +2055,18 @@
         </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="translated">På den här kanalen</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="translated">På den här instansen</target>
+      <trans-unit id="39ec2a3e2da523763f4db4b2227b7dbae5d70eba" datatype="html">
+        <source>In this instance's network</source>
+        <target state="translated">På den här instansens nätverk</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/header/suggestion.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">14</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9848e55d7c95eddc1c4a044a63ed0e88e8cb6f5c" datatype="html">
         <source>In the vidiverse</source>
         <target state="translated">I videoversum</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="translated">Besök kanalen <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>
+        <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>
@@ -2028,16 +2074,16 @@
         <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>
+        <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="translated">Återställ</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>
+        <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>
@@ -2045,7 +2091,7 @@
         <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>
+        <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>
@@ -2053,7 +2099,7 @@
         <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>
+        <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>
@@ -2061,7 +2107,7 @@
         <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>
+        <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>
@@ -2069,7 +2115,7 @@
         <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>
+        <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>
@@ -2077,16 +2123,16 @@
         <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">258</context></context-group></trans-unit>
       <trans-unit id="dc67060f94f0f2b58549f54a5c07925dffd20238">
         <source>Display sensitive content</source>
         <target>Visa känsligt material</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>
+        <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>
@@ -2094,7 +2140,7 @@
         <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>
+        <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>
@@ -2102,7 +2148,7 @@
         <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>
+        <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>
@@ -2110,23 +2156,23 @@
         <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">223</context></context-group></trans-unit>
       <trans-unit id="265ee68edfe57e510270da31ec99f67d94346009" datatype="html">
         <source>Reset</source>
         <target state="translated">Återställ</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>
+        <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="translated">Visa alla kategorier</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>
+        <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>
@@ -2134,14 +2180,14 @@
         <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">232</context></context-group></trans-unit>
       <trans-unit id="e19d80c6277747a68f3da8cfe1318303d2b5c952" datatype="html">
         <source>Display all licenses</source>
         <target state="translated">Visa alla licenser</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>
+        <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>
@@ -2149,15 +2195,15 @@
         <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">241</context></context-group></trans-unit>
       <trans-unit id="dcc3173a99661496cd1f836283993cc3e6576b26" datatype="html">
         <source>Display all languages</source>
         <target state="translated">Visa alla språk</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>
+        <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>
@@ -2165,7 +2211,7 @@
         <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>
+        <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>
@@ -2173,12 +2219,28 @@
         <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="translated">Sök på</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="translated">Videoversum</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="translated">Återställ</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>
+        <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>
@@ -2186,7 +2248,7 @@
         <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>
+        <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>
@@ -2194,13 +2256,21 @@
         <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">24</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">24</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">24</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">24</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">24</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">24</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">24</context></context-group></trans-unit>
+      <trans-unit id="6f5a458f827503ac7b8697688ecf3e0490818ee8" datatype="html">
+        <source>Video channels</source>
+        <target state="translated">Videokanaler</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>
@@ -2208,7 +2278,7 @@
         <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>
+        <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>
@@ -2216,7 +2286,7 @@
         <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>
+        <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>
@@ -2226,7 +2296,7 @@
         <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>
+        <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>
@@ -2234,7 +2304,7 @@
         <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>
+        <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>
@@ -2242,7 +2312,7 @@
         <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>
+        <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>
@@ -2250,33 +2320,39 @@
         <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>
-      <trans-unit id="19f59c3f026a162a78af887faff8d9b2b11a4e27" datatype="html">
+        
+        
+      <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">250</context></context-group></trans-unit><trans-unit id="554a78c6ac043b4a9058c39d63e4475a454e4dc2" datatype="html">
         <source>
                     Tags could be used to suggest relevant recommendations. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
                     There is a maximum of 5 tags. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
-                    Press Enter to add a new tag.
-                  </source>
-        <target state="translated">Taggar kan användas för att föreslå relaterade rekommendationer. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> Max fem taggar kan användas. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> Tryck Enter för att lägga till en ny tagg. </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>
+                    Press <x id="START_TAG_KBD" ctype="x-kbd" equiv-text="&lt;kbd>"/>Enter<x id="CLOSE_TAG_KBD" ctype="x-kbd" equiv-text="&lt;/kbd>"/> to add a new tag.
+                  </source><target state="new">
+                    Tags could be used to suggest relevant recommendations. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
+                    There is a maximum of 5 tags. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
+                    Press <x id="START_TAG_KBD" ctype="x-kbd" equiv-text="&lt;kbd>"/>Enter<x id="CLOSE_TAG_KBD" ctype="x-kbd" equiv-text="&lt;/kbd>"/> 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>
+      
       <trans-unit id="9bdd535a2817bf0b843a124bf65e4992625e7ecf">
         <source>+ Tag</source>
         <target>+ Tagg</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>
+        <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="translated">Ange en tagg</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>
+        <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>
@@ -2284,7 +2360,7 @@
         <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>
+        <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>
@@ -2292,14 +2368,14 @@
         <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/+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/+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">
         <source>Video descriptions are truncated by default and require manual action to expand them.</source>
@@ -2309,7 +2385,7 @@
         <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-edit.component.html</context><context context-type="linenumber">43</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">43</context></context-group>
       </trans-unit>
       <trans-unit id="0cc554f4d7bb6a87515d2d95438e183b50702071">
         <source>Channel</source>
@@ -2317,13 +2393,25 @@
         <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>
+        <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="8830692ad55d27a3db817e37e96d93522298ffda" datatype="html">
+        <source>Channel to bind the playlist to</source>
+        <target state="translated">Kanal att koppla spellistan till</target>
+        <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">73</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">73</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="3c78b53bca33467190c0b7a01320bc093a2b1427">
         <source>Privacy</source>
@@ -2331,14 +2419,14 @@
         <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">208</context></context-group></trans-unit>
       <trans-unit id="4b6dbf2d92858e82bcf6ae5dbc8dfb4b29d82ad0" datatype="html">
         <source>FAQ</source>
         <target state="translated">Vanliga frågor</target>
@@ -2365,7 +2453,7 @@
         <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>
+        <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>
@@ -2373,7 +2461,7 @@
         <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>
+        <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>
@@ -2381,7 +2469,7 @@
         <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>
+        <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>
@@ -2389,7 +2477,7 @@
         <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>
+        <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>
@@ -2397,7 +2485,7 @@
         <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>
+        <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>
@@ -2405,7 +2493,7 @@
         <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>
+        <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>
@@ -2413,7 +2501,7 @@
         <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>
+        <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>
@@ -2421,7 +2509,7 @@
         <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>
+        <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>
@@ -2429,7 +2517,7 @@
         <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>
+        <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>
@@ -2437,7 +2525,7 @@
         <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>
+        <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>
@@ -2445,7 +2533,7 @@
         <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>
+        <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>
@@ -2453,7 +2541,7 @@
         <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>
+        <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>
@@ -2461,7 +2549,7 @@
         <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>
+        <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>
@@ -2471,7 +2559,7 @@
         <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>
+        <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>
@@ -2479,7 +2567,7 @@
         <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>
+        <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>
@@ -2487,7 +2575,7 @@
         <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>
+        <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>
@@ -2495,55 +2583,61 @@
         <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>
-      <trans-unit id="f61f989de6fc12f99369a90800e4b5462d3f10a0">
-        <source>Short text to tell people how they can support you (membership platform...).</source>
-        <target>Kort text för att berätta hur andra kan stödja dig (medlemsplattform …).</target>
-        <context-group name="null">
-          <context context-type="linenumber">226</context>
+        <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="64ec6a11fd39e7a4cba76281bdd490124437e96f" datatype="html">
+        <source>
+                    Short text to tell people how they can support you (membership platform...).
+                  </source><target state="new">
+                    Short text to tell people how they can support you (membership platform...).
+                  </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context>
+          <context context-type="linenumber">235</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>
+      
       <trans-unit id="50d14e019ef14b4180e247e0b3a45386a8a78bf6">
         <source>Original publication date</source>
         <target>Ursprungligt publiceringsdatum</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>
-      <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>Detta är det datum då innehållet publicerades för första gången (till exempel premiärdagen för en film)</target>
-        <context-group name="null">
-          <context context-type="linenumber">240</context>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">252</context></context-group></trans-unit><trans-unit id="109ff29714fe8f2a0bfb232f04b908062fac22b0" datatype="html">
+        <source>
+                    This is the date when the content was originally published (e.g. the release date for a film)
+                  </source><target state="new">
+                    This is the date when the content was originally published (e.g. the release date for a film)
+                  </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+videos/+video-edit/shared/video-edit.component.html</context>
+          <context context-type="linenumber">255</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>
+      
       <trans-unit id="3549ee96125a43181f80712ed744ee223a0e645a">
         <source>Enable video comments</source>
         <target>Tillåt videokommentarer</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">273</context></context-group></trans-unit>
       <trans-unit id="0b365218ce1ae736f9066fd3d47278cc8f3ed1d0">
         <source>Enable download</source>
         <target>Tillåt nerladdning</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">278</context></context-group></trans-unit>
       <trans-unit id="d91da0abc638c05e52adea253d0813f3584da4b1">
         <source>Advanced settings</source>
         <target>Avancerade inställningar</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>
+        <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>
@@ -2551,8 +2645,8 @@
         <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>
+        <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">
         <source>
@@ -2568,7 +2662,7 @@
         <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">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">10</context></context-group>
       </trans-unit>
       <trans-unit id="385811ab5a5c3e96e0db46c9ce1fc3147d8cd4c7">
         <source>Sorry, but something went wrong</source>
@@ -2576,9 +2670,9 @@
         <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>
+        <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>
@@ -2588,7 +2682,7 @@
         <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>
+        <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>
@@ -2596,10 +2690,10 @@
         <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>
+        <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">16</context></context-group>
       </trans-unit>
       <trans-unit id="21add64f0f3ebbedf1150ca822c6e149494ab7a9">
         <source>Select the file to upload</source>
@@ -2607,7 +2701,7 @@
         <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>
+        <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>
@@ -2615,7 +2709,7 @@
         <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>
+        <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>
@@ -2623,7 +2717,7 @@
         <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>
+        <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>
@@ -2639,19 +2733,19 @@
         <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>
+        <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="translated">Behandlar …</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>
+        <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="translated">Total videokvot</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/shared/shared-main/users/user-quota.component.html</context><context context-type="linenumber">3</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">139</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">
         <source>Congratulations! Your video is now available in your private library.</source>
         <target>
@@ -2660,7 +2754,7 @@
         <context-group name="null">
           <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-upload.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-upload.component.html</context><context context-type="linenumber">67</context></context-group>
       </trans-unit>
       <trans-unit id="f7ac2376749c7985f94f0fc89ba75ea624de1215">
         <source>Publish will be available when upload is finished</source>
@@ -2668,7 +2762,7 @@
         <context-group name="null">
           <context context-type="linenumber">79</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">80</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">80</context></context-group>
       </trans-unit>
       <trans-unit id="223aae0477f79f0bc4436c1c57619415f04cbbb3">
         <source>Publish</source>
@@ -2676,7 +2770,19 @@
         <context-group name="null">
           <context context-type="linenumber">86</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">87</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">82</context></context-group>
+      </trans-unit><trans-unit id="6206e8d42fea5d7147d3e68d8e061583886603ae" datatype="html">
+        <source>Sorry, the upload feature is disabled for your account. If you want to add videos, an admin must unlock your quota.</source><target state="new">Sorry, the upload feature is disabled for your account. If you want to add videos, an admin must unlock your quota.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+videos/+video-edit/video-add.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit><trans-unit id="d8bd78a04cdb225ea9a4c95dbdc4db26229981e2" datatype="html">
+        <source>Read instance rules for help</source><target state="new">Read instance rules for help</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+videos/+video-edit/video-add.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="2fcbf437e001f47974d45bd03a19e0d9245fdb3b">
         <source>Select the torrent to import</source>
@@ -2684,15 +2790,12 @@
         <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-import-torrent.component.html</context><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-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="translated">ELLER</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>
+        <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">
         <source>Paste magnet URI</source>
@@ -2700,7 +2803,7 @@
         <context-group name="null">
           <context context-type="linenumber">14</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">13</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">13</context></context-group>
       </trans-unit>
       <trans-unit id="e39797d5be895f1b0c9ca9ba4e45429f9b95aa52">
         <source>
@@ -2714,7 +2817,7 @@
         <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-torrent.component.html</context><context context-type="linenumber">16</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">16</context></context-group>
       </trans-unit>
       <trans-unit id="7cb3731472edd9edf6a6d036498c2c8388157266">
         <source>Congratulations, the video will be imported with BitTorrent! You can already add information about this video.</source>
@@ -2724,7 +2827,7 @@
         <context-group name="null">
           <context context-type="linenumber">57</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">56</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">56</context></context-group>
       </trans-unit>
       <trans-unit id="ebe5234338205e30a59cf703e2a2b6ef49fb75f8" datatype="html">
         <source>
@@ -2733,66 +2836,57 @@
     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.
   </source>
         <target state="translated">Vi rekommenderar att du inte använder användaren <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>"/> för att ladda upp dina videor eftersom det är din instans administrationskonto. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> Du kan istället <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>skapa ett separat konto<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> att ladda upp dina videor med. </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">10</context></context-group></trans-unit>
       <trans-unit id="0b60d939cf0f1af9fe513f31164d198abf671860">
         <source>Import <x id="INTERPOLATION" equiv-text="{{ videoName }}"/></source>
         <target>Importera <x id="INTERPOLATION" equiv-text="{{ videoName }}"/></target>
         <context-group name="null">
           <context context-type="linenumber">3</context>
         </context-group>
-        <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">19</context></context-group></trans-unit>
       <trans-unit id="e9cfe8bd050660077212af5c02f5be24821f28d5">
         <source>Upload <x id="INTERPOLATION" equiv-text="{{ videoName }}"/></source>
         <target>Ladda upp <x id="INTERPOLATION" equiv-text="{{ videoName }}"/></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/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">20</context></context-group></trans-unit>
       <trans-unit id="4faf57baebf0fb754a91af0c39521a30cbb1def3">
         <source>Upload a file</source>
         <target>Lada upp en fil</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.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">26</context></context-group></trans-unit>
       <trans-unit id="fc865859d33eab6fa0a8015233e4686cd544d470">
         <source>Import with URL</source>
         <target>Importera med URL</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.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">36</context></context-group></trans-unit>
       <trans-unit id="752c401d7dcd708944eef60e411187f71d882340">
         <source>Import with torrent</source>
         <target>Importera med torrent</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/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">46</context></context-group></trans-unit>
       <trans-unit id="7ce8b0d7cc34d4c1ef4a21e990b0a001337bedd1" datatype="html">
         <source>Other videos</source>
         <target state="translated">Andra videor</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>
+        <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="translated">AUTOMATISK UPPSPELNING</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>
+        <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">
         <source>Share</source>
@@ -2800,31 +2894,22 @@
         <context-group name="null">
           <context context-type="linenumber">83</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">3</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">3</context></context-group>
       </trans-unit>
       <trans-unit id="71420314c00d8b709ea1aad8f608498f8db92258" datatype="html">
         <source>Share the playlist</source>
         <target state="translated">Dela spellistan</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>
+        <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="translated">Dela spellistan med den här positionen</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>
+        <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="translated">Dela videon</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>
+        <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">
         <source>QR-Code</source>
@@ -2832,12 +2917,12 @@
         <context-group name="null">
           <context context-type="linenumber">27</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">43</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">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="translated">Länken är inte säker (utan HTTPS),så den inbäddade videon kommer inte fungera på webbplatser med HTTPS (webbläsare blockerar okrypterade HTTP-förfrågningar på webbplatser med HTTPS).</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>
+        <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">
         <source>Embed</source>
@@ -2845,7 +2930,7 @@
         <context-group name="null">
           <context context-type="linenumber">35</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">53</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">53</context></context-group>
       </trans-unit>
       <trans-unit id="9adb13e2ba5160c8b0b100dc3f4cbe6051b5af9b">
         <source>Auto select subtitle</source>
@@ -2853,38 +2938,35 @@
         <context-group name="null">
           <context context-type="linenumber">76</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">90</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">90</context></context-group>
       </trans-unit>
       <trans-unit id="f0e9c70583e8264cda79a8151de51cbb1ecb02ef" datatype="html">
         <source>More customization</source>
         <target state="translated">Fler inställningar</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">177</context></context-group></trans-unit>
       <trans-unit id="cfad9c5d4357d7c4ac99cc2ce63c54c9738901d7" datatype="html">
         <source>Less customization</source>
         <target state="translated">Färre inställningar</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">185</context></context-group></trans-unit>
       <trans-unit id="0c2e76c41af25effefd456fb1e86143e0cfd1a4e">
         <source>Autoplay</source>
         <target>Automatisk uppspelning</target>
         <context-group name="null">
           <context context-type="linenumber">127</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">121</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">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="translated">Stöd <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>
+        <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="translated">Kanske senare</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>
+        <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">
         <source>Muted</source>
@@ -2892,8 +2974,8 @@
         <context-group name="null">
           <context context-type="linenumber">20</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>
         <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">
         <source>Loop</source>
@@ -2901,7 +2983,7 @@
         <context-group name="null">
           <context context-type="linenumber">141</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">135</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">135</context></context-group>
       </trans-unit>
       <trans-unit id="af3ab1a1035c222ccc88816baa236eb95cea7523">
         <source>Display video title</source>
@@ -2909,7 +2991,7 @@
         <context-group name="null">
           <context context-type="linenumber">150</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">144</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">144</context></context-group>
       </trans-unit>
       <trans-unit id="cd0fb32d9b50b615bdce413ca955283df7ab0b74">
         <source>Display privacy warning</source>
@@ -2917,7 +2999,7 @@
         <context-group name="null">
           <context context-type="linenumber">157</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">151</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">151</context></context-group>
       </trans-unit>
       <trans-unit id="3e10c53d0372db827bf38571e56d166f1df963bf">
         <source>Display player controls</source>
@@ -2925,7 +3007,13 @@
         <context-group name="null">
           <context context-type="linenumber">164</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">158</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">158</context></context-group>
+      </trans-unit><trans-unit id="d0701f8fd194fd5a29f6dc015d0a27c85128b65e" datatype="html">
+        <source>Display PeerTube button link</source><target state="new">Display PeerTube button link</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+videos/+video-watch/modal/video-share.component.html</context>
+          <context context-type="linenumber">165</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="3c4c080864b313cfdff5fdea6aae5da276246d99">
         <source>Public</source>
@@ -2933,7 +3021,7 @@
         <context-group name="null">
           <context context-type="linenumber">8</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">8</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">8</context></context-group>
       </trans-unit>
       <trans-unit id="38e66e2d779d6d819cd7703ab73ab1bab75f8614">
         <source>The video is being imported, it will be available when the import is finished.</source>
@@ -2943,7 +3031,7 @@
         <context-group name="null">
           <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">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">19</context></context-group>
       </trans-unit>
       <trans-unit id="d2a8e8e4e5345201c07ba03a7fafe8b663230246">
         <source>The video is being transcoded, it may not work properly.</source>
@@ -2953,7 +3041,7 @@
         <context-group name="null">
           <context context-type="linenumber">23</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">23</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">23</context></context-group>
       </trans-unit>
       <trans-unit id="2dd4add38e83d8ec58e37735e76090e9738c974a">
         <source>This video will be published on <x id="INTERPOLATION" equiv-text="{{ video.scheduledUpdate.updateAt | date: 'full' }}"/>. </source>
@@ -2963,54 +3051,45 @@
         <context-group name="null">
           <context context-type="linenumber">27</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">27</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">27</context></context-group>
       </trans-unit>
-      <trans-unit id="bd7055d3e38beff538463e75d508d1c75c683710">
-        <source>This video is blacklisted.</source>
-        <target>Videon har svartlistats.</target>
-        <context-group name="null">
+      <trans-unit id="bbb57efb2edd572de832c8fff03bc85d7723abd3" datatype="html">
+        <source>This video is blocked.</source>
+        <target state="translated">Den här videon har blockerats.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context>
           <context context-type="linenumber">32</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">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="translated">Publicerad <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>
+        <target state="translated">Publicerad <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 }}"/> visningar<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>
       <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="translated">Publicerad <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>
+        <target state="translated">Publicerad <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 }}"/> visningar<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>
       <trans-unit id="74059c5dce671d464259e3ce37a5d408c3fd7720" datatype="html">
         <source>SUPPORT</source>
         <target state="translated">STÖTTA</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>
+        <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="translated">DELA</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>
+        <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="translated">SPARA</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><trans-unit id="8270eaeb2582eef4b7cde314c370aaf5b45c43d2" datatype="html">
+        <source>DOWNLOAD</source><target state="new">DOWNLOAD</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 context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">117</context>
         </context-group>
       </trans-unit>
       <trans-unit id="82b59049f3f89d900c98da9319e156dd513e3ced">
@@ -3019,7 +3098,7 @@
         <context-group name="null">
           <context context-type="linenumber">63</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>
+        <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">
         <source>Dislike this video</source>
@@ -3027,24 +3106,12 @@
         <context-group name="null">
           <context context-type="linenumber">71</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>
+        <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="translated">Supportalternativ för den här videon</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">
-        <source>Go the channel page</source>
-        <target>Gå till kanalens sida</target>
-        <context-group name="null">
-          <context context-type="linenumber">118</context>
-        </context-group>
-        <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>
+        <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">
         <source>By <x id="INTERPOLATION" equiv-text="{{ video.byAccount }}"/></source>
@@ -3052,48 +3119,27 @@
         <context-group name="null">
           <context context-type="linenumber">129</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">154</context></context-group>
-      </trans-unit>
-      <trans-unit id="be73b652c2707f42b5d780d0c7b8fc5ea0b1706c">
-        <source>Go to the account page</source>
-        <target>Gå till kontots sida</target>
-        <context-group name="null">
-          <context context-type="linenumber">63</context>
-        </context-group>
-        <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">168</context></context-group></trans-unit>
       <trans-unit id="d0336848b0c375a1c25ba369b3481ee383217a4f" datatype="html">
         <source>Subscribe</source>
         <target state="translated">Prenumerera</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>
+        <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="translated">Prenumerera på alla kanalerna</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>
+        <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="translated">prenumererar på kanaler</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>
+        <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="translated">{VAR_SELECT, select, undefined {Avsluta prenumeration} other {Avsluta prenumerationer på samtliga kanaler} }</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>
+        <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">
         <source>Show more</source>
@@ -3101,122 +3147,97 @@
         <context-group name="null">
           <context context-type="linenumber">141</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">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">195</context></context-group></trans-unit>
       <trans-unit id="5403a767248e304199592271bba3366d2ca3f903">
         <source>Show less</source>
         <target>Visa mindre</target>
         <context-group name="null">
           <context context-type="linenumber">147</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">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">201</context></context-group></trans-unit>
       <trans-unit id="57bfd54c230fc20caff1f0b321ad42be3bf859a6" datatype="html">
         <source>Origin instance</source>
         <target state="translated">Ursprungsinstans</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">213</context></context-group></trans-unit>
       <trans-unit id="284b55e2ae9f6e5bc78c92a18ef26da02f380079">
         <source>Originally published</source>
         <target>Ursprungligen publicerad</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-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">218</context></context-group></trans-unit>
       <trans-unit id="4c0ba3cde3b3c58b855ffb4beaa5804a2fc3826b" datatype="html">
         <source>Friendly Reminder:</source>
         <target state="translated">Tänk på</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">281</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="translated">att den här videons delningssystem gör att en del teknisk information om ditt system (som publik IP-adress) kan skickas till andra serventer.</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">282</context></context-group></trans-unit>
       <trans-unit id="e60c11e1b1dfbbeda577364b8de39ded2d796c5e">
         <source>More information</source>
         <target>Mer information</target>
         <context-group name="null">
           <context context-type="linenumber">215</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">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>
-      </trans-unit>
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">52</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">53</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">286</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="translated">Den här videon har blockerats eftersom nya videor blockeras automatiskt</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">67</context></context-group></trans-unit>
       <trans-unit id="bd499ca7913bb5408fd139a4cb4f863852d5f318">
         <source>Get more information</source>
         <target>Visa mer information</target>
         <context-group name="null">
           <context context-type="linenumber">215</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">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">286</context></context-group></trans-unit>
       <trans-unit id="20fc98888baf65b5ba9fe9622dc036fa8dec6a5f" datatype="html">
         <source>OK</source>
         <target state="translated">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">289</context></context-group></trans-unit>
       <trans-unit id="a8db53a47543132da1a68066f0a9cba0551a8933" datatype="html">
         <source>1 Comment</source>
-        <target state="translated">En kommntar</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>
+        <target state="translated">1 kommentar</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>
       <trans-unit id="8164af7bbe7fb9a3d2064ddf2627a7a4d5446575" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{ componentPagination.totalItems }}"/> Comments</source>
         <target state="translated"><x id="INTERPOLATION" equiv-text="{{ componentPagination.totalItems }}"/> kommentarer</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>
+        <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="translated">Kommentarer</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>
+        <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="translated">SORTERA EFTER</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>
+        <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="translated">Nyast först (standard)</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>
+        <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="translated">Flest svar först</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>
+        <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">
         <source>No comments.</source>
@@ -3224,22 +3245,22 @@
         <context-group name="null">
           <context context-type="linenumber">17</context>
         </context-group>
-        <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>
+        <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="translated">Visa <x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/> svar från bland andra <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">78</context></context-group>
+        <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="translated">Visa <x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/> svar från <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>
+        <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="translated">Visa <x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/> svar</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>
+        <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">
         <source>Comments are disabled.</source>
@@ -3249,7 +3270,7 @@
         <context-group name="null">
           <context context-type="linenumber">64</context>
         </context-group>
-        <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>
+        <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">
         <source>Add comment...</source>
@@ -3257,15 +3278,12 @@
         <context-group name="null">
           <context context-type="linenumber">6</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">6</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">6</context></context-group>
       </trans-unit>
       <trans-unit id="8956c0f4c6974289fc63f1ab6b54f5b32ed65eeb" datatype="html">
         <source>Reply</source>
         <target state="translated">Svara</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>
+        <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">
         <source>You are one step away from commenting</source>
@@ -3273,7 +3291,7 @@
         <context-group name="null">
           <context context-type="linenumber">28</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">31</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">31</context></context-group>
       </trans-unit>
       <trans-unit id="2c6453cc150c9f652a7f1238d2f172e625f0f117" datatype="html">
         <source>
@@ -3282,10 +3300,7 @@
       from within the software's interface.
     </source>
         <target state="translated">Du kan kommentera från ett konto på vilken ActivityPub-kompatibel instans som helst. På de flesta plattformar hittar du videon genom att skriva dess webbadress i sökrutan. Därefter kan du skriva din kommentar från mjukvarans användargränssnitt.</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>
+        <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">
         <source>If you have an account on Mastodon or Pleroma, you can open it directly in their interface:</source>
@@ -3295,12 +3310,12 @@
         <context-group name="null">
           <context context-type="linenumber">41</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">40</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">40</context></context-group>
       </trans-unit>
       <trans-unit id="413bcc4a4c824366e17673f38cb2af4619e940e2" datatype="html">
         <source>Login to comment</source>
         <target state="translated">Logga in för att skriva kommentarer</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>
+        <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">
         <source>Highlighted comment</source>
@@ -3308,7 +3323,7 @@
         <context-group name="null">
           <context context-type="linenumber">5</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">20</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">20</context></context-group>
       </trans-unit>
       <trans-unit id="cb23d4d98007aa4d7123837f4c17a671848377d6">
         <source>Reply</source>
@@ -3316,41 +3331,17 @@
         <context-group name="null">
           <context context-type="linenumber">14</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">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="translated">Den här kommentaren har raderats</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>
-      <trans-unit id="fee25862814afd08fca2abe1452e6841e8b57b1e" datatype="html">
-        <source>Follows &amp; redundancies</source>
-        <target state="translated">Följare och redundans</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/follows/follows.component.html</context>
-          <context context-type="linenumber">2</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="f995df052a1dfc675c2a21926420a707d9601936">
-        <source>Following</source>
-        <target>Följer</target>
-        <context-group name="null">
-          <context context-type="linenumber">5</context>
-        </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/follows.component.html</context><context context-type="linenumber">5</context></context-group>
-      </trans-unit>
-      <trans-unit id="9bee670725966ed477b4c33a545c8b5436b0065e">
-        <source>Followers</source>
-        <target>Följare</target>
-        <context-group name="null">
-          <context context-type="linenumber">3</context>
-        </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/follows.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-comment.component.html</context><context context-type="linenumber">62</context></context-group></trans-unit>
       <trans-unit id="31e902955ed9501f124814901a0031c37a070f1f" datatype="html">
         <source>Video redundancies</source>
         <target state="translated">Videoredundans</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/follows.component.html</context><context context-type="linenumber">9</context></context-group>
+        <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>
       <trans-unit id="4e8635c108375983b42229df44bda8c0af84f396">
         <source>1 host (without "http://") per line</source>
@@ -3358,57 +3349,60 @@
         <context-group name="null">
           <context context-type="linenumber">5</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">11</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">11</context></context-group>
+      </trans-unit><trans-unit id="b56702ff10875710f111634cc315cd3ef01b206f" 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 comment 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 comment 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/report-modals/report.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/report.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="3a23875897fb8099f85410700fcca415626621a3" datatype="html">
         <source>Follow domain</source>
         <target state="translated">Följ domän</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context><context context-type="linenumber">19</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">24</context></context-group></trans-unit>
       <trans-unit id="25925fc5826bc5b3eeae7c45b08b0ed74b9e2954">
         <source>Filter...</source>
         <target>Filtrera …</target>
         <context-group name="null">
           <context context-type="linenumber">27</context>
         </context-group>
-        <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/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">27</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">16</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">16</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">32</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">29</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">16</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">16</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">16</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">16</context></context-group></trans-unit>
       <trans-unit id="1e5e23363e949f7dcbaf034bdb141a561132a10e" datatype="html">
         <source>Clear filters</source>
         <target state="translated">Återställ filter</target>
+        
+        
+        
+        
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">31</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">20</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">20</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">36</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">33</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">20</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">20</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">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">14</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">20</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">20</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlists.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-video-channels/my-account-video-channels.component.html</context><context context-type="linenumber">14</context></context-group></trans-unit><trans-unit id="08658c558971c49d1120d6c8a5a4fecf5c3b1561" datatype="html">
+        <source>Video/Comment/Account</source><target state="new">Video/Comment/Account</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 context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context>
+          <context context-type="linenumber">41</context>
         </context-group>
       </trans-unit>
       <trans-unit id="45cc8ca94b5a50842a9a8ef804a5ab089a38ae5c">
@@ -3425,21 +3419,24 @@
         <context-group name="null">
           <context context-type="linenumber">17</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">22</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">28</context></context-group></trans-unit>
       <trans-unit id="873b72903b1858a9cd6c8967521030b4d7d1435b">
         <source>State</source>
         <target>Status</target>
         <context-group name="null">
           <context context-type="linenumber">10</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">11</context></context-group>
-      </trans-unit>
-      <trans-unit id="029bd95d7fe7f3660953c216bf96f6b5243b30ec" datatype="html">
-        <source>Delayed.</source>
-        <target state="translated">Uppskjuten.</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">19</context></context-group></trans-unit>
+      <trans-unit id="c107d625f06dc3b494d0a22546e6a0609360007d" datatype="html">
+        <source>Delayed</source>
+        <target state="translated">Uppskjuten</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>
@@ -3467,82 +3464,74 @@
         <context-group name="null">
           <context context-type="linenumber">11</context>
         </context-group>
-        <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/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">42</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">31</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">34</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">20</context></context-group></trans-unit>
       <trans-unit id="9c9e0eb0ce8abea8b4c7c5dbb6e80a9a5f5b4193" datatype="html">
         <source>Open actor page in a new tab</source>
         <target state="translated">Öppna aktörens sida i en ny flik</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context>
-          <context context-type="linenumber">33</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">46</context></context-group></trans-unit>
       <trans-unit id="7823909fb1d8d313382f6f4bd842f1a7ef6f08d1">
         <source>Accepted</source>
         <target>Accepterad</target>
         <context-group name="null">
           <context context-type="linenumber">32</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">39</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">43</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">53</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">52</context></context-group></trans-unit>
       <trans-unit id="e6a27066251ca1e04c5be86ad758380856df2506">
         <source>Pending</source>
         <target>Väntar</target>
         <context-group name="null">
           <context context-type="linenumber">33</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">40</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">44</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">56</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">55</context></context-group></trans-unit>
       <trans-unit id="6fc5e65900ae1415d3170d5d2842f0dcae1b6645">
         <source>Accept</source>
         <target>Godkänn</target>
         <context-group name="null">
           <context context-type="linenumber">41</context>
         </context-group>
-        <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">39</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/+my-account/my-account-ownership/my-account-ownership.component.html</context><context context-type="linenumber">33</context></context-group></trans-unit>
       <trans-unit id="4a5613f6b472c1ed863dff1be932913a251f27a2">
         <source>Refuse</source>
         <target>Neka</target>
         <context-group name="null">
           <context context-type="linenumber">42</context>
         </context-group>
-        <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">40</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">34</context></context-group></trans-unit>
       <trans-unit id="ff772a40114c96a96d8f2bfe0394658eda5a51ca" datatype="html">
         <source>No follower found matching current filters.</source>
         <target state="translated">Inga följare matchar de nuvarande filtren.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">60</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">68</context></context-group></trans-unit>
       <trans-unit id="2bea79363bdef3300bdcad9ef20a680c05e9f781" datatype="html">
         <source>Your instance doesn't have any follower.</source>
         <target state="translated">Din instans har inga följare.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">61</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">69</context></context-group></trans-unit>
       <trans-unit id="57295ef79276c604cc86f130c0046469e150f7cd" 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}'}}"/> followers</source>
         <target state="translated">Visar följare <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> till <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> av <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context>
-          <context context-type="linenumber">5</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">10</context></context-group></trans-unit>
       <trans-unit id="270a185f179774aa3cee3120ed4f5650e8816b9f" datatype="html">
         <source><x id="INTERPOLATION" equiv-text="{{ action }}"/></source>
         <target state="translated"><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>
+        <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">
         <source>Host</source>
@@ -3550,77 +3539,129 @@
         <context-group name="null">
           <context context-type="linenumber">19</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">26</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">32</context></context-group></trans-unit>
       <trans-unit id="107f0fef40ba00a1a183a03eba85054ed8413f92" datatype="html">
         <source>Redundancy allowed <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="translated">Redundans tillåten <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/following-list/following-list.component.html</context><context context-type="linenumber">29</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">35</context></context-group></trans-unit>
       <trans-unit id="8cffa679dff97a096d44fca9348eeaa1867d40aa" datatype="html">
         <source>Open instance in a new tab</source>
         <target state="translated">Öppna instansen i en ny flik</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">45</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">43</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">43</context></context-group></trans-unit>
       <trans-unit id="d9b4b939363bf385cbb7828c1535f2e2a5e0d362" datatype="html">
         <source>No host found matching current filters.</source>
         <target state="translated">Inga värdar matchar de nuvarande filtren.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context>
-          <context context-type="linenumber">62</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">71</context></context-group></trans-unit>
       <trans-unit id="6f635f2eba7fe60e4266192fbfef20948fbe3b0a" datatype="html">
         <source>Your instance is not following anyone.</source>
         <target state="translated">Din instans följer inte någon annan.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context>
-          <context context-type="linenumber">63</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">72</context></context-group></trans-unit>
       <trans-unit id="b2ddee45fe4c3ebc20f39ed10ef70505c9eb65ce" 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}'}}"/> hosts</source>
         <target state="translated">Visar värd <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> till <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> av <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context>
-          <context context-type="linenumber">5</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">10</context></context-group></trans-unit>
       <trans-unit id="f697b4a4f0b6413284269de48a9e1a43a362646f" datatype="html">
         <source>Follow domains</source>
         <target state="translated">Följ domäner</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context><context context-type="linenumber">70</context></context-group>
-      </trans-unit>
-      <trans-unit id="8a3b2dec938ae1c71320e653fb1fdb810e614f76" datatype="html">
-        <source>My videos duplicated by remote instances</source>
-        <target state="translated">Mina videor som duplicerats på fjärrinstanser</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context><context context-type="linenumber">79</context></context-group></trans-unit><trans-unit id="1fc09996a8d49e3d1cc3abedb3edf3fa4c427a5f" datatype="html">
+        <source>Videos redundancies</source><target state="new">Videos redundancies</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">7</context>
+          <context context-type="linenumber">3</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="8a3b2dec938ae1c71320e653fb1fdb810e614f76" datatype="html">
+        <source>My videos duplicated by remote instances</source>
+        <target state="translated">Mina videor som duplicerats på fjärrinstanser</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">12</context></context-group></trans-unit>
       <trans-unit id="cb2281bf5c9f420429bbd5c5473ee7aacc879e1e" datatype="html">
         <source>Remote videos duplicated by my instance</source>
         <target state="translated">Fjärrvideor som duplicerats på min instans</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">8</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">13</context></context-group></trans-unit>
       <trans-unit id="31cf824034489eb42f6a388d5980b98b8e1de015">
         <source>Create user</source>
         <target>Skapa användare</target>
         <context-group name="null">
           <context context-type="linenumber">6</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">6</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">42</context></context-group></trans-unit><trans-unit id="55d4cef22a65e0850dc95aa127f45e9df525f68f" datatype="html">
+        <source>Table parameters</source><target state="new">Table parameters</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context>
+          <context context-type="linenumber">58</context>
+        </context-group>
+      </trans-unit><trans-unit id="9a9bde1333d7ee11eca00f2c3ed41fb83d661a06" datatype="html">
+        <source>No matching column found</source><target state="new">No matching column found</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context>
+          <context context-type="linenumber">62</context>
+        </context-group>
+      </trans-unit><trans-unit id="ed66036cb394f49f63cb5fb5632f483613b790f6" datatype="html">
+        <source>Highlight banned users</source><target state="new">Highlight banned users</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>
+      </trans-unit><trans-unit id="4e54cc9c19b45ab633c8a4ff4080fcc27ad07b16" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{ getColumn('username').label }}"/> <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"><x id="INTERPOLATION" equiv-text="{{ getColumn('username').label }}"/> <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/users/user-list/user-list.component.html</context>
+          <context context-type="linenumber">74</context>
+        </context-group>
+      </trans-unit><trans-unit id="d1f5f2222bbc833132a4e0a1fe514f080a3f6bd5" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{ getColumn('email').label }}"/></source><target state="new"><x id="INTERPOLATION" equiv-text="{{ getColumn('email').label }}"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context>
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit><trans-unit id="9cc9fd966ff06f760cdc1f9bb644d90a4a5d0cb5" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{ getColumn('quota').label }}"/> <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"><x id="INTERPOLATION" equiv-text="{{ getColumn('quota').label }}"/> <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/users/user-list/user-list.component.html</context>
+          <context context-type="linenumber">76</context>
+        </context-group>
+      </trans-unit><trans-unit id="7ca81a0721c16dbe0a3e6cd8ea19b6feb5e541cb" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{ getColumn('quotaDaily').label }}"/></source><target state="new"><x id="INTERPOLATION" equiv-text="{{ getColumn('quotaDaily').label }}"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context>
+          <context context-type="linenumber">77</context>
+        </context-group>
+      </trans-unit><trans-unit id="08f7d5b13f5920e7ed395162827677efb693b81a" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{ getColumn('role').label }}"/> <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"><x id="INTERPOLATION" equiv-text="{{ getColumn('role').label }}"/> <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/users/user-list/user-list.component.html</context>
+          <context context-type="linenumber">78</context>
+        </context-group>
+      </trans-unit><trans-unit id="8c6fbf037008ced295ca343f913572dc2ee44bbe" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{ getColumn('pluginAuth').label }}"/></source><target state="new"><x id="INTERPOLATION" equiv-text="{{ getColumn('pluginAuth').label }}"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context>
+          <context context-type="linenumber">79</context>
+        </context-group>
+      </trans-unit><trans-unit id="1dcea846966aa6efb42221e9af931bfe574fd5ed" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{ getColumn('createdAt').label }}"/> <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"><x id="INTERPOLATION" equiv-text="{{ getColumn('createdAt').label }}"/> <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/users/user-list/user-list.component.html</context>
+          <context context-type="linenumber">80</context>
+        </context-group>
+      </trans-unit><trans-unit id="7b2ba6295cd9b86a9ce3534075f0c910a499119d" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{ getColumn('lastLoginDate').label }}"/> <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"><x id="INTERPOLATION" equiv-text="{{ getColumn('lastLoginDate').label }}"/> <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/users/user-list/user-list.component.html</context>
+          <context context-type="linenumber">81</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="08c74dc9762957593b91f6eb5d65efdfc975bf48">
         <source>Username</source>
@@ -3668,10 +3709,10 @@
         <context-group name="null">
           <context context-type="linenumber">43</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">124</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">124</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">48</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">124</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">124</context></context-group></trans-unit>
       <trans-unit id="2768c5a04ffea51e600e3b1e14ed676afb355f23" datatype="html">
         <source>
           Transcoding is enabled. The video quota only takes into account <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>original<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> video size. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
@@ -3693,10 +3734,10 @@
         <context-group name="null">
           <context context-type="linenumber">73</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/+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/shared/shared-main/users/user-quota.component.html</context><context context-type="linenumber">13</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/+admin/users/user-edit/user-edit.component.html</context><context context-type="linenumber">155</context></context-group></trans-unit>
       <trans-unit id="a0f69dcdccf2174aa7fa17708ac63c3a3104456c" datatype="html">
         <source>Doesn't need review before a video goes public</source>
         <target state="translated">Behöver inte granskas innan en video publiceras offentligt</target>
@@ -3752,60 +3793,52 @@
         </context-group>
         <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-edit/user-password.component.html</context><context context-type="linenumber">11</context></context-group>
       </trans-unit>
-      <trans-unit id="5e8b4663c17c337a1f11160c0a683350936faa1f">
-        <source>Users list</source>
-        <target>Användarlista</target>
-        <context-group name="null">
-          <context context-type="linenumber">2</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">2</context></context-group>
-      </trans-unit>
       <trans-unit id="ea762ca1d74c96d8568ac68482778f52ca531cc4">
         <source>Batch actions</source>
         <target>Massåtgärder</target>
         <context-group name="null">
           <context context-type="linenumber">19</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">22</context></context-group>
-      </trans-unit>
-      <trans-unit id="08ea8692dc2a7050026df26fc39b22960bde9de5">
-        <source>Username <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>Användarnamn <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 name="null">
-          <context context-type="linenumber">40</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">45</context></context-group>
-      </trans-unit>
-      <trans-unit id="df84781eeb873f037ee688789bde034be9b49074">
-        <source>Video quota <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>Videokvot <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 name="null">
-          <context context-type="linenumber">42</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">47</context></context-group>
-      </trans-unit>
-      <trans-unit id="c38a6a10b47b82463eda45f856348b51daa96b97" datatype="html">
-        <source>Auth plugin</source>
-        <target state="translated">Autentiserande tillägg</target>
+        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context><context context-type="linenumber">13</context></context-group>
+      </trans-unit><trans-unit id="715d36ab50d156b744ffedc975ffb97cae75ff7b" datatype="html">
+        <source>Advanced user filters</source><target state="new">Advanced user filters</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">27</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="adba7c8b43e42581460fbe5d08b5cb5ab60eba4b">
-        <source>(banned)</source>
-        <target>(blockerad)</target>
-        <context-group name="null">
-          <context context-type="linenumber">65</context>
+      </trans-unit><trans-unit id="765fcd9017ea1e180bbd266673d7cf11535d8c4a" datatype="html">
+        <source>Banned users</source><target state="new">Banned users</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/users/user-list/user-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">82</context></context-group>
       </trans-unit>
+      
+      
+      
+      <trans-unit id="7d88bb14f4ef7eaea7ca41c1832c66451410047a" datatype="html">
+        <source>The user was banned</source>
+        <target state="translated">Den här användaren har blockerats</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context><context context-type="linenumber">159</context></context-group></trans-unit>
       <trans-unit id="ed64ec2b14251cfbe9ab28abde51d3f052fde1e7" datatype="html">
         <source>Open account in a new tab</source>
         <target state="translated">Öppna kontot i en ny flik</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>
+        
+        
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">59</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">105</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">39</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">38</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">39</context></context-group></trans-unit><trans-unit id="d9e38d58225f58cb64126e4d5ec58f39dcb326df" datatype="html">
+        <source>
+          Deleted account
+        </source><target state="new">
+          Deleted account
+        </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context>
+          <context context-type="linenumber">74</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="02ba1a65db92d1d0ab4ba380086e9be61891aaa5">
         <source>User's email must be verified to login</source>
@@ -3813,15 +3846,21 @@
         <context-group name="null">
           <context context-type="linenumber">72</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">89</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">128</context></context-group></trans-unit>
       <trans-unit id="79cee9973620b2592ff2824c525aa8ed0b5e2b8b">
         <source>User's email is verified / User can login without email verification</source>
         <target>Användarens e-post har verifierats / Användaren behöver inte verifiera sin e-post för att logga in</target>
         <context-group name="null">
           <context context-type="linenumber">76</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">93</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">132</context></context-group></trans-unit><trans-unit id="12289e981bf1acd36d74ee0e50d6fb43ba29ca6a" datatype="html">
+        <source>Total daily video quota</source><target state="new">Total daily video quota</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context>
+          <context context-type="linenumber">149</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="a9587caabf0dc5d824f817baae1c2f5521d9b1ee">
         <source>Ban reason:</source>
@@ -3830,14 +3869,11 @@
           <context context-type="linenumber">95</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">121</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">176</context></context-group></trans-unit>
       <trans-unit id="0fcb785bae83bfd5c1b1bbeb57cda21eec98ae1a" 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}'}}"/> users</source>
         <target state="translated">Visar användare <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> till <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> av <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/users/user-list/user-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">6</context></context-group>
       </trans-unit>
       <trans-unit id="90868353e7e6f5994109ee1011131cefa992116c">
         <source>Moderation</source>
@@ -3845,174 +3881,156 @@
         <context-group name="null">
           <context context-type="linenumber">2</context>
         </context-group>
-        <context-group purpose="location"><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">
-        <source>Video abuses</source>
-        <target>Anmälningar om missbruk</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/moderation.component.html</context><context context-type="linenumber">5</context></context-group>
-      </trans-unit>
-      <trans-unit id="6053443ad364f974301570cfadfa86ee0b43f1a9">
-        <source><x id="INTERPOLATION" equiv-text="{{ autoBlacklistVideosEnabled ? 'Manually blacklisted videos' : 'Blacklisted videos' }}"/></source>
-        <target><x id="INTERPOLATION" equiv-text="{{ autoBlacklistVideosEnabled ? 'Manuellt svartlistade videor' : 'Svartlistade videor' }}"/></target>
-        <context-group name="null">
-          <context context-type="linenumber">7</context>
-        </context-group>
-        <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">
-        <source>Auto-blacklisted videos</source>
-        <target>Automatiskt svartlistade videor</target>
-        <context-group name="null">
-          <context context-type="linenumber">9</context>
-        </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/moderation.component.html</context><context context-type="linenumber">9</context></context-group>
+        <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>
+      
+      <trans-unit id="d2e7333704502d1720b353742634630b71ea8bd7" datatype="html">
+        <source>Video blocks</source>
+        <target state="translated">Blockerade videor</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">3</context></context-group></trans-unit>
       <trans-unit id="b1ff109b26ae8f08650415454b9098c43eba2e2c">
         <source>Muted accounts</source>
         <target>Ignorerade konton</target>
         <context-group name="null">
           <context context-type="linenumber">2</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/moderation.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-blocklist/my-account-blocklist.component.html</context><context context-type="linenumber">2</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">3</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">3</context></context-group></trans-unit>
       <trans-unit id="bd0611346af048015e0a1275091ef68ce98832d2">
         <source>Muted servers</source>
         <target>Ignorerade servrar</target>
         <context-group name="null">
           <context context-type="linenumber">13</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/moderation.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">3</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">3</context></context-group></trans-unit>
+      <trans-unit id="2122599f5b51ab83849bc77fa5cafcdcd896ac72" datatype="html">
+        <source>Advanced block filters</source>
+        <target state="translated">Avancerade blockeringsfilter</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">23</context></context-group></trans-unit>
+      <trans-unit id="7d0cb3dbf192b9f3a5dbfb6d56d7609b200cbd4e" datatype="html">
+        <source>Automatic blocks</source>
+        <target state="translated">Automatisk blockering</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">24</context></context-group></trans-unit>
+      <trans-unit id="dfc11b6dc1387e59dbb79d248cf4c638fb9df3ea" datatype="html">
+        <source>Manual blocks</source>
+        <target state="translated">Manuell blockering</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">25</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="translated">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">29</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">42</context></context-group></trans-unit>
       <trans-unit id="b7237eade678ae47485fbd27ec7f8c1079a8c6b7" datatype="html">
         <source>Total size</source>
         <target state="translated">Total storlek</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">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">30</context></context-group></trans-unit>
       <trans-unit id="e536fc8b9a652aa7f7b87193cdfa143481da3bad" datatype="html">
         <source>List redundancies</source>
         <target state="translated">Visa redundanser</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">33</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">37</context></context-group></trans-unit>
       <trans-unit id="897116a91d135b1552880aed6050814a4a0df28a" datatype="html">
         <source>Your instance doesn't mirror any video.</source>
         <target state="translated">Din instans speglar inte några videor.</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">77</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">81</context></context-group></trans-unit>
       <trans-unit id="afc5c2bbf66996ab213f6eca65b24ca423d36e31" datatype="html">
         <source>Your instance has no mirrored videos.</source>
         <target state="translated">Din instans har inga speglade videor.</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">78</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">82</context></context-group></trans-unit>
       <trans-unit id="0e96ed54157e69989a2c0bcce2f62399accdaa27" datatype="html">
         <source>Enabled strategies stats</source>
         <target state="translated">Statistik för valda strategier</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">87</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">91</context></context-group></trans-unit>
       <trans-unit id="0f6e6ec286d43c14f16444a077639090f38e29de" datatype="html">
         <source>No redundancy strategy is enabled on your instance.</source>
         <target state="translated">Din instans följer inte någon strategi för videoredundans.</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">91</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">95</context></context-group></trans-unit>
       <trans-unit id="96dfa3efa02bfafc0bc6d4ab186ebef2813a9e8a">
         <source>Sensitive</source>
         <target>Känsligt</target>
         <context-group name="null">
           <context context-type="linenumber">9</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">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">43</context></context-group></trans-unit>
       <trans-unit id="b748c96a1ee98d2fa9a645fb71838f5d4938855b">
         <source>Unfederated</source>
         <target>Inte federerad</target>
         <context-group name="null">
           <context context-type="linenumber">10</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">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">44</context></context-group></trans-unit>
       <trans-unit id="a7f42da3bb4eea0b71b0a20a2aff6612a82cab99">
         <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>Datum <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 name="null">
           <context context-type="linenumber">11</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">27</context></context-group>
-      </trans-unit>
-      <trans-unit id="1c16132124fd96151ccf858aad5a98108df6c93a" datatype="html">
-        <source>Video was blacklisted</source>
-        <target state="translated">Videon svartlistades</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">
-        <source>Go to the video</source>
-        <target>Gå till videon</target>
-        <context-group name="null">
-          <context context-type="linenumber">33</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">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">45</context></context-group></trans-unit>
       <trans-unit id="030b4423b92167200e39519599f9b863b4f7c62c">
         <source>Actions</source>
         <target>Åtgärder</target>
         <context-group name="null">
           <context context-type="linenumber">44</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">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">
-        <source>Blacklist reason:</source>
-        <target>Anledning för svartlistning:</target>
-        <context-group name="null">
-          <context context-type="linenumber">43</context>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">170</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">90</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">18</context></context-group></trans-unit><trans-unit id="c5cc399a82eb7993156daf2d6c1d9e071cde47ad" datatype="html">
+        <source>No abuses found matching current filters.</source><target state="new">No abuses found matching current filters.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context>
+          <context context-type="linenumber">188</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">82</context></context-group>
-      </trans-unit>
-      <trans-unit id="88a2cc2d9ca0506186bbfab6c4e0c32c44a9ee98" datatype="html">
-        <source>No blacklisted video found matching current filters.</source>
-        <target state="translated">Inga svartlistade videor matchar de nuvarande filtren.</target>
+      </trans-unit><trans-unit id="5d9dd64c1974b18918db7f24051bb385bd5558e1" datatype="html">
+        <source>No abuses found.</source><target state="new">No abuses 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="linenumber">93</context>
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context>
+          <context context-type="linenumber">189</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="294036a9ad4dd71531d3032678d9ff00d8ff9ebb" datatype="html">
-        <source>No blacklisted video found.</source>
-        <target state="translated">Inga svartlistade videor hittades.</target>
+      <trans-unit id="d2a65fafac0e4e0a3289ec54627bd7f691d8020d" datatype="html">
+        <source>Block reason:</source>
+        <target state="translated">Anledning för blockering:</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">103</context></context-group></trans-unit>
+      <trans-unit id="f8add432da83aa37b8cf03c5b907c3a9e51088fd" datatype="html">
+        <source>No blocked video found matching current filters.</source>
+        <target state="translated">Det finns inga blockerade videor som matchar kriterierna.</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">123</context></context-group></trans-unit>
+      <trans-unit id="8d02797f76f99ad51f55e91ff82088e8772152e0" datatype="html">
+        <source>No blocked video found.</source>
+        <target state="translated">Inga blockerade videor hittades.</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">124</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="translated">Visar blockerad video <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> till <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> av <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/></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">10</context></context-group></trans-unit><trans-unit id="24968c3b9f7cb940df7e5bf46f61a11710481829" datatype="html">
+        <source>Reports</source><target state="new">Reports</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/abuse-list/abuse-list.component.html</context>
+          <context context-type="linenumber">3</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="translated">Visar nummer <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> till <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> av <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> svartlistade videor</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">5</context>
+          <context context-type="sourcefile">src/app/+my-account/my-account-abuses/my-account-abuses-list.component.html</context>
+          <context context-type="linenumber">3</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bb863c794307735652d8695143e116eaee8a3c4f">
@@ -4021,8 +4039,8 @@
         <context-group name="null">
           <context context-type="linenumber">3</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">3</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/moderation-comment-modal.component.html</context><context context-type="linenumber">3</context></context-group></trans-unit>
       <trans-unit id="5731e5d5ac989bf08848b5a57a5586cf84d80964">
         <source>This comment can only be seen by you or the other moderators.</source>
         <target>
@@ -4031,72 +4049,70 @@
         <context-group name="null">
           <context context-type="linenumber">18</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">20</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/moderation-comment-modal.component.html</context><context context-type="linenumber">20</context></context-group></trans-unit>
       <trans-unit id="0562e455c88234829f3c27a38f3039f027bfd5d2">
         <source>Update this comment</source>
         <target>Uppdatera den här kommentaren</target>
         <context-group name="null">
           <context context-type="linenumber">26</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">31</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/moderation-comment-modal.component.html</context><context context-type="linenumber">31</context></context-group></trans-unit>
       <trans-unit id="f7753a5d0baa909f5860eb49e14c41fc4ae00fb4" datatype="html">
         <source>Advanced report filters</source>
         <target state="translated">Avancerade anmälningsfilter</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">18</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">18</context></context-group></trans-unit>
       <trans-unit id="006dd388f1d14f58c33fb4ed4bb05a1dfbc42ffa" datatype="html">
         <source>Unsolved reports</source>
         <target state="translated">Obehandlade anmälningar</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">19</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">19</context></context-group></trans-unit>
       <trans-unit id="dee7eb63010b67c2464dd7987307e85369f24b9d" datatype="html">
         <source>Accepted reports</source>
         <target state="translated">Accepterade anmälningar</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">20</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">20</context></context-group></trans-unit>
       <trans-unit id="8140a31650a8a974acaf9f7e88cfb246ed6c9314" datatype="html">
         <source>Refused reports</source>
         <target state="translated">Nekade anmälningar</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">21</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="1c33f537774e1418d848442439b6c0fc62d9af47" datatype="html">
-        <source>Reports with blacklisted videos</source>
-        <target state="translated">Anmälningar med svartlistade videor</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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">21</context></context-group></trans-unit>
+      <trans-unit id="1f5ed7018178a08c8eb17305833874a976fa428c" datatype="html">
+        <source>Reports with blocked videos</source>
+        <target state="translated">Anmälningar mot blockerade videor</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.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="translated">Anmälningar med raderade videor</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">23</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">23</context></context-group></trans-unit>
       <trans-unit id="2bf5a31043ff476ca081a4080f3f3f17518dc6f2">
         <source>Reporter</source>
         <target>Anmälare</target>
         <context-group name="null">
           <context context-type="linenumber">8</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">40</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">7</context></context-group>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-details.component.html</context><context context-type="linenumber">7</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">40</context></context-group></trans-unit><trans-unit id="fd7b8e728c25b616934661747224b1b2e7d9ea5c" datatype="html">
+        <source>
+          <x id="ICU" equiv-text="{abuse.countReportsForReporter, plural, =1 {...} other {...}}"/><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">
+          <x id="ICU" equiv-text="{abuse.countReportsForReporter, plural, =1 {...} other {...}}"/><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/shared/shared-abuse-list/abuse-details.component.html</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit><trans-unit id="fe8634bd713368d7971877c0e09d1869f09c924d" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {1 report} other {<x id="INTERPOLATION" equiv-text="{{ abuse.countReportsForReporter }}"/> reports} }</source><target state="new">{VAR_PLURAL, plural, =1 {1 report} other {<x id="INTERPOLATION" equiv-text="{{ abuse.countReportsForReporter }}"/> reports} }</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-details.component.html</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="2d1ea268a6a9f483dbc2cbfe19bf4256a57a6af4">
         <source>Video</source>
@@ -4104,268 +4120,242 @@
         <context-group name="null">
           <context context-type="linenumber">9</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">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/+my-account/my-account-ownership/my-account-ownership.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-imports/my-account-video-imports.component.html</context><context context-type="linenumber">18</context></context-group></trans-unit>
       <trans-unit id="dee48932053451ee2dfafe5500a5262cd4220d5e" datatype="html">
         <source>This video has been reported multiple times.</source>
         <target state="translated">Den här videon har anmälts mer än en gång.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">88</context></context-group></trans-unit>
+      <trans-unit id="e9a289d014e33a5a45e1cf47131074f50abb7c18" datatype="html">
+        <source>The video was blocked</source>
+        <target state="translated">Den här videon har blockerats</target>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">97</context></context-group></trans-unit><trans-unit id="e186aa4dc511ff4347ec5304691000e3e0a4a048" datatype="html">
+        <source>by <x id="INTERPOLATION" equiv-text="{{ abuse.video.channel?.displayName }}"/> on <x id="INTERPOLATION_1" equiv-text="{{ abuse.video.channel?.host }}"/> </source><target state="new">by <x id="INTERPOLATION" equiv-text="{{ abuse.video.channel?.displayName }}"/> on <x id="INTERPOLATION_1" equiv-text="{{ abuse.video.channel?.host }}"/> </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">80</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>
-        <target state="translated">av <x id="INTERPOLATION" equiv-text="{{ videoAbuse.video.channel?.displayName }}"/> på <x id="INTERPOLATION_1" equiv-text="{{ videoAbuse.video.channel?.host }}"/> </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">91</context>
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context>
+          <context context-type="linenumber">100</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">107</context>
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context>
+          <context context-type="linenumber">117</context>
         </context-group>
       </trans-unit>
+      
       <trans-unit id="b0a337363ec610cf41744167b12f020e141a4617" datatype="html">
         <source>Video was deleted</source>
         <target state="translated">Videon har raderats</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">107</context></context-group></trans-unit><trans-unit id="c45d28b67fd917b804defbf9e465ec1abe0c67da" datatype="html">
+        <source>
+          Account deleted
+        </source><target state="new">
+          Account deleted
+        </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">98</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="7c6eca36ec5dfbab2049ec1c58f8b6fe9d71c23b" datatype="html">
-        <source>No video abuses found matching current filters.</source>
-        <target state="translated">Inga anmälningar matchar de nuvarande filtren.</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">141</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="b2134df91de00d33d8440610b13abb2595df00f4" datatype="html">
-        <source>No video abuses found.</source>
-        <target state="translated">Inga anmälningar hittades.</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="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context>
           <context context-type="linenumber">142</context>
         </context-group>
       </trans-unit>
+      
+      
       <trans-unit id="c1074e8c49b3cdfaeb7fcaf8cb27e44139389e29" datatype="html">
         <source>Open video in a new tab</source>
         <target state="translated">Öppna videon i en ny flik</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">49</context></context-group></trans-unit>
       <trans-unit id="7e7ad19f1bcc2c33cdba4c1ad25e2b398ad453d9">
         <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>Status <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 name="null">
           <context context-type="linenumber">11</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">23</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">27</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">43</context></context-group>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">43</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">29</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">33</context></context-group></trans-unit><trans-unit id="ea965d544a7dfd8185064c52cdfff553cf94d585" datatype="html">
+        <source>Messages</source><target state="new">Messages</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit><trans-unit id="31b1d714a41f00a1347b78884eee465b1d90f7e1" datatype="html">
+        <source>Internal note</source><target state="new">Internal note</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="9a7b523cbbebabeb9b10482291b58c52825a4b05" datatype="html">
         <source>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>"/></source>
         <target state="translated">Betyg <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">
-        <source>Go to the account</source>
-        <target>Gå till kontot</target>
-        <context-group name="null">
-          <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-ownership.component.html</context><context context-type="linenumber">27</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">30</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="translated">Visar anmälning <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> till <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> av <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/></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">5</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="f0045181fddf6e1642314ee5464667098ac18d9d" datatype="html">
-        <source><x id="ICU" equiv-text="{videoAbuse.countReportsForReporter, plural, =1 {...} other {...}}"/><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="translated"><x id="ICU" equiv-text="{videoAbuse.countReportsForReporter, plural, =1 {…} other {…}}"/><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/+admin/moderation/video-abuse-list/video-abuse-details.component.html</context>
-          <context context-type="linenumber">20</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="730ae657d91e79c45d0685a7060cfea40ea8ea85" datatype="html">
-        <source>{VAR_PLURAL, plural, =1 {1 report} other {<x id="INTERPOLATION" equiv-text="{{ videoAbuse.countReportsForReporter }}"/> reports} }</source>
-        <target state="translated">{VAR_PLURAL, plural, =1 {1 rapport} other {<x id="INTERPOLATION" equiv-text="{{ videoAbuse.countReportsForReporter }}"/> rapporter} }</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">21</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.html</context><context context-type="linenumber">5</context></context-group></trans-unit>
+      
+      
       <trans-unit id="4dbabcc6e79125d4b798ba8139a40202db712475" datatype="html">
         <source>Reportee</source>
         <target state="translated">Anmäld</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-details.component.html</context><context context-type="linenumber">33</context></context-group></trans-unit><trans-unit id="da3ebfaee320ad7a8a41c75d6ee19e687f9b484d" datatype="html">
+        <source>
+          <x id="ICU" equiv-text="{abuse.countReportsForReportee, plural, =1 {...} other {...}}"/><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">
+          <x id="ICU" equiv-text="{abuse.countReportsForReportee, plural, =1 {...} other {...}}"/><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/+admin/moderation/video-abuse-list/video-abuse-details.component.html</context>
-          <context context-type="linenumber">27</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="28b2bd6301b8655f46a26faf4db7f11e06be1747" datatype="html">
-        <source><x id="ICU" equiv-text="{videoAbuse.countReportsForReportee, plural, =1 {...} other {...}}"/><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="translated"><x id="ICU" equiv-text="{videoAbuse.countReportsForReportee, plural, =1 {…} other {…}}"/><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/+admin/moderation/video-abuse-list/video-abuse-details.component.html</context>
-          <context context-type="linenumber">40</context>
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-details.component.html</context>
+          <context context-type="linenumber">51</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="9f8e4923506fc6890efb71d403fc048f22dd616c" datatype="html">
-        <source>{VAR_PLURAL, plural, =1 {1 report} other {<x id="INTERPOLATION" equiv-text="{{ videoAbuse.countReportsForReportee }}"/> reports} }</source>
-        <target state="translated">{VAR_PLURAL, plural, =1 {1 rapport} other {<x id="INTERPOLATION" equiv-text="{{ videoAbuse.countReportsForReportee }}"/> rapporter} }</target>
+      </trans-unit><trans-unit id="bdd37f55632abc18fb1fbf95d4b3f5f89ce3237b" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {1 report} other {<x id="INTERPOLATION" equiv-text="{{ abuse.countReportsForReportee }}"/> reports} }</source><target state="new">{VAR_PLURAL, plural, =1 {1 report} other {<x id="INTERPOLATION" equiv-text="{{ abuse.countReportsForReportee }}"/> reports} }</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">41</context>
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-details.component.html</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
+      
+      
       <trans-unit id="9da0107a35751e722c8b4bca7636fc7645dbdbdc" datatype="html">
         <source>Updated</source>
         <target state="translated">Uppdaterad</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">47</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="86f26b106c67be3c2e98b82766656e5d9da86dff">
-        <source>Unblacklist</source>
-        <target>Ta bort från svartlista</target>
-        <context-group name="null">
-          <context context-type="linenumber">17</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">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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-details.component.html</context><context context-type="linenumber">58</context></context-group></trans-unit>
       <trans-unit id="a3ae5c724857d00c006273db314041ab0664c269" datatype="html">
         <source>Mute domain</source>
         <target state="translated">Ignorera domän</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">24</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">24</context></context-group></trans-unit>
       <trans-unit id="ff78f059449d44322f627d0f66df07abe476962b">
         <source>Instance</source>
         <target>Instans</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">32</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">32</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">
         <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>Ignorerad på <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 name="null">
           <context context-type="linenumber">13</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">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">33</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">29</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">29</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">33</context></context-group></trans-unit>
       <trans-unit id="1f689fada9748a830117f5b429a88ef8629082a8">
         <source>Unmute</source>
         <target>Sluta ignorera</target>
         <context-group name="null">
           <context context-type="linenumber">23</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">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">40</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">36</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">36</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">40</context></context-group></trans-unit>
       <trans-unit id="4cac34ce105daa25964c217fdf0515a0a6ee5db9" datatype="html">
         <source>No server found matching current filters.</source>
         <target state="translated">Inga servrar matchar de nuvarande filtren.</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">56</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">56</context></context-group></trans-unit>
       <trans-unit id="0ba22bd964baaf0c2f85d6731fccca31dbf06dae" datatype="html">
         <source>No server found.</source>
         <target state="translated">Inga servrar hittades.</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">57</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">57</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="translated">Visar nummer <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> till <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> av <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> ignorerade instanser</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">10</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">10</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="translated">Det verkar som att din server inte använder HTTPS. Webbserver måste ha TLS aktiverat för att följa andra servrar.</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context><context context-type="linenumber">72</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">81</context></context-group></trans-unit>
       <trans-unit id="c7b73cded84adfa978aae675417f4bb688631a71" datatype="html">
         <source>Mute domains</source>
         <target state="translated">Ignorera instanser</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">64</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">64</context></context-group></trans-unit>
       <trans-unit id="29881a45dafbe5aa05cd9d0441a4c0c2fb06df92">
         <source>Account</source>
         <target>Konto</target>
         <context-group name="null">
           <context context-type="linenumber">12</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">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">28</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">28</context></context-group></trans-unit>
       <trans-unit id="33c4091a2a2438ba655caa47ede7f7a82f5f0297" datatype="html">
         <source>No account found matching current filters.</source>
         <target state="translated">Inga konton matchar de nuvarande filtren.</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">63</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">63</context></context-group></trans-unit>
       <trans-unit id="5d3b267bc054bb6b5743dd3d46ee58cff5141697" datatype="html">
         <source>No account found.</source>
         <target state="translated">Inga konton hittades.</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">64</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">64</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="translated">Visar nummer <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> till <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> av <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/> ignorerade konton</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">10</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">10</context></context-group></trans-unit>
       <trans-unit id="d204665b42241ca94ecad49df699cc60df43a7b5">
         <source>Plugins/Themes</source>
         <target>Insticksprogram och teman</target>
         <context-group name="null">
           <context context-type="linenumber">2</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugins.component.html</context><context context-type="linenumber">2</context></context-group>
-      </trans-unit>
+        
+      <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>
       <trans-unit id="86288c2ac6b43ed195f0bc8bce825a3ab8151b71">
         <source>Installed</source>
         <target>Installerad</target>
         <context-group name="null">
           <context context-type="linenumber">5</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugins.component.html</context><context context-type="linenumber">5</context></context-group>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugins.component.html</context><context context-type="linenumber">3</context></context-group></trans-unit>
+      <trans-unit id="5a329cfc387d2231434afc2842ff649392da8921" datatype="html">
+        <source>Plugin homepage (new window)</source>
+        <target state="translated">Tilläggets hemsida (nytt fönster)</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">
         <source>Search</source>
@@ -4373,41 +4363,22 @@
         <context-group name="null">
           <context context-type="linenumber">7</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">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">5</context></context-group></trans-unit>
       <trans-unit id="82c6fc1dfd67a87c2a9f54c221907d0d61c63b88" datatype="html">
         <source>Users can resolve distant content</source>
         <target state="translated">Användare kan hämta fjärrinnehåll</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>
+        <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="1cb86e649ad2e5cfc86efb2d28c06b1d959f8aa6">
-        <source>Homepage</source>
-        <target>Hemsida</target>
-        <context-group name="null">
-          <context context-type="linenumber">51</context>
-        </context-group>
-        <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">
-        <source>Close this message</source><target state="new">Close this message</target>
+      <trans-unit id="0fab2b1e25b97842c52a6b95f139bda7e416fde6" datatype="html">
+        <source>Close this message</source>
+        <target state="translated">Stäng meddelandet</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">
-        <source>Go to the plugin homepage</source>
-        <target>Gå till insticksprogrammets hemsida</target>
-        <context-group name="null">
-          <context context-type="linenumber">48</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">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">
         <source>Settings</source>
         <target>Inställningar</target>
@@ -4417,6 +4388,7 @@
         <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>
@@ -4465,8 +4437,8 @@
         <context-group name="null">
           <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>
         <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">
         <source>No results.</source>
@@ -4478,9 +4450,9 @@
         </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">28</context></context-group>
       </trans-unit>
-      <trans-unit id="1e395fc65f656ebaf9384ca5452f0cc4e9512811" datatype="html">
-        <source>Go to the plugin npm package</source>
-        <target state="translated">Gå till tilläggets npm-paket</target>
+      <trans-unit id="fc06c11db79db253b0d0f1b070cf48e039e8a3a8" datatype="html">
+        <source>Plugin npm package (new window)</source>
+        <target state="translated">Tilläggets npm-paket (nytt fönster)</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>
@@ -4502,32 +4474,32 @@
         <context-group name="null">
           <context context-type="linenumber">2</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/system.component.html</context><context context-type="linenumber">2</context></context-group>
-      </trans-unit>
+        
+      <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>
       <trans-unit id="43f1cc191ebc0b8ce89f6916aa634f5a57158798">
         <source>Jobs</source>
         <target>Jobb</target>
         <context-group name="null">
           <context context-type="linenumber">5</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/system.component.html</context><context context-type="linenumber">5</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/system.component.html</context><context context-type="linenumber">3</context></context-group></trans-unit>
       <trans-unit id="eb3d5aefff38a814b76da74371cbf02c0789a1ef">
         <source>Logs</source>
         <target>Loggar</target>
         <context-group name="null">
           <context context-type="linenumber">7</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/system.component.html</context><context context-type="linenumber">7</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/system.component.html</context><context context-type="linenumber">5</context></context-group></trans-unit>
       <trans-unit id="dcfc990a822e11feb00eb91d9cf4d6ec0ed37dd0">
         <source>Debug</source>
         <target>Felsök</target>
         <context-group name="null">
           <context context-type="linenumber">9</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/system.component.html</context><context context-type="linenumber">9</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/system/system.component.html</context><context context-type="linenumber">7</context></context-group></trans-unit>
       <trans-unit id="555ae4dbd23d5056aeafc8f3f31ebbab170bb917" datatype="html">
         <source>Job type</source>
         <target state="translated">Jobbtyp</target>
@@ -4573,7 +4545,7 @@
       <trans-unit id="3441b78841dad60f36576d99e38241ae7fefa933" datatype="html">
         <source>INSTANCE</source>
         <target state="translated">INSTANS</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>
+        <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>
@@ -4581,9 +4553,9 @@
         <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>
+        <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>
@@ -4591,7 +4563,7 @@
         <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>
+        <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">
         <source>Main instance categories</source>
@@ -4599,7 +4571,7 @@
         <context-group name="null">
           <context context-type="linenumber">40</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">47</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">48</context></context-group>
       </trans-unit>
       <trans-unit id="f871b41bfbdb193507cce2cd848c2d02bde77a03">
         <source>No results found</source>
@@ -4607,39 +4579,39 @@
         <context-group name="null">
           <context context-type="linenumber">33</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">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>
+        <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="translated"><x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Delningssystemet<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> gör att en del teknisk information om ditt system (såsom publik IP-adress) kan skickas till andra serventer, men hjälper även till att minska serverbelastningen.</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>
+        <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="translated">Hjälp till att distribuera videor som spelas</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>
+        <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="translated">Börja spela upp videon direkt när du besöker dess sida.</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>
+        <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="translated">Automatisk uppspelning av videor</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>
+        <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="translated">När en video slutar börjar nästa föreslagna video direkt.</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>
+        <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="translated">Börja spela nästa video automatiskt</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>
+        <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">
         <source>Main languages you/your moderators speak</source>
@@ -4647,17 +4619,17 @@
         <context-group name="null">
           <context context-type="linenumber">52</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">59</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">60</context></context-group>
       </trans-unit>
       <trans-unit id="f27b192f4d3153db7dc7044bea37e71655bfb3ea" datatype="html">
         <source>MODERATION &amp; NSFW</source>
         <target state="translated">MODERATION OCH OFÖRBEHÅLLSAMT MATERIAL</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>
+        <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="translated">Hantera <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>användare<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> för att bygga ett moderationsteam. </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>
+        <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">
         <source>This instance is dedicated to sensitive or NSFW content</source>
@@ -4665,7 +4637,7 @@
         <context-group name="null">
           <context context-type="linenumber">68</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">86</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">87</context></context-group>
       </trans-unit>
       <trans-unit id="55c4d3cc288701854147f69ccf3d86d316589968" datatype="html">
         <source>
@@ -4673,7 +4645,7 @@
                       Moreover, the NSFW checkbox on video upload will be automatically checked by default.
                     </source>
         <target state="translated">Du kan låta andra administratörer veta att du huvudsakligen federerar känsligt material.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> Dessutom kommer rutan för känsligt och oförbehållsamt innehåll vara ifylld som standard. </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>
+        <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>
@@ -4681,12 +4653,12 @@
         <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>
+        <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="translated">Med <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Lista inte<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> eller <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Gör miniatyrer suddiga<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> kommer användaren bli tillfrågad om han eller hon vill titta på videon. </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>
+        <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>
@@ -4694,8 +4666,8 @@
         <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>
+        <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>
@@ -4703,8 +4675,8 @@
         <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>
+        <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>
@@ -4712,22 +4684,22 @@
         <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">8</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="translated">Strategi</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">22</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">28</context></context-group></trans-unit>
       <trans-unit id="69580f2c2dbf4edf7096820ba8c393367352d774">
         <source>Terms</source>
         <target>Villkor</target>
         <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/+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>
@@ -4737,7 +4709,7 @@
         <context-group name="null">
           <context context-type="linenumber">82</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">130</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">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>
@@ -4747,19 +4719,19 @@
         <context-group name="null">
           <context context-type="linenumber">76</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">139</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">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="translated">Vem modererar instansen? Hur ser policyn ut för videor med känsligt eller oförbehållsamt innehåll, politiska videor och liknande?</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>
+        <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="translated">DU OCH DIN INSTANS</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>
+        <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">
         <source>Who is behind the instance?</source>
@@ -4767,12 +4739,12 @@
         <context-group name="null">
           <context context-type="linenumber">133</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">160</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">161</context></context-group>
       </trans-unit>
       <trans-unit id="963707d11903100147b40788e4f67cc93a234308" datatype="html">
         <source>A single person? A non-profit? A company?</source>
         <target state="translated">En person? En ideell förening? Ett företag?</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>
+        <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">
         <source>Why did you create this instance?</source>
@@ -4780,12 +4752,12 @@
         <context-group name="null">
           <context context-type="linenumber">145</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">172</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">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="translated">För att dela dina egna videor eller för att tillåta kontoregistrering och låta folk ladda upp vad de vill?</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>
+        <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">
         <source>How long do you plan to maintain this instance?</source>
@@ -4793,12 +4765,12 @@
         <context-group name="null">
           <context context-type="linenumber">156</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">183</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">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="translated">Detta är viktigt att veta för användare som vill registrera sig på din instans</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>
+        <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">
         <source>How will you finance the PeerTube server?</source>
@@ -4806,17 +4778,17 @@
         <context-group name="null">
           <context context-type="linenumber">167</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">194</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">195</context></context-group>
       </trans-unit>
       <trans-unit id="1bb1ca2264b1ab8be73deee74852a4e6d40101c5" datatype="html">
         <source>With your own funds? With user donations? Advertising?</source>
         <target state="translated">Med dina egna medel? Donationer från användarna? Reklamintäkter?</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>
+        <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="translated">ÖVRIG 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>
+        <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">
         <source>What server/hardware does the instance run on?</source>
@@ -4824,12 +4796,12 @@
         <context-group name="null">
           <context context-type="linenumber">180</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">215</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">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="translated">till exempel 2vCore 2GB RAM eller en länk till den servertjänst du hyr</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>
+        <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">
         <source>Instance information</source>
@@ -4837,17 +4809,17 @@
         <context-group name="null">
           <context context-type="linenumber">5</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">6</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">7</context></context-group>
       </trans-unit>
       <trans-unit id="e18e5566ca6266c849208665c731805571333a8b" datatype="html">
         <source>APPEARANCE</source>
         <target state="translated">UTSEENDE</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>
+        <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="translated">Använd <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>tillägg och teman<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> för mer avancerade ändringar, eller för att <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/>lägga till mindre anpassningar<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>
+        <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">
         <source>default</source>
@@ -4855,12 +4827,12 @@
         <context-group name="null">
           <context context-type="linenumber">206</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">254</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">255</context></context-group>
       </trans-unit>
       <trans-unit id="a42daa4748e433f25a51f598627d10de9c88d5d3" datatype="html">
         <source>Landing page</source>
         <target state="translated">Startsida</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>
+        <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">
         <source>Discover videos</source>
@@ -4868,7 +4840,7 @@
         <context-group name="null">
           <context context-type="linenumber">219</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">266</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">267</context></context-group>
       </trans-unit>
       <trans-unit id="9091b36f8890eabbd2305789eb826d16e8f4641d">
         <source>Trending videos</source>
@@ -4876,7 +4848,7 @@
         <context-group name="null">
           <context context-type="linenumber">220</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">267</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">268</context></context-group>
       </trans-unit>
       <trans-unit id="4c65fb9a424be158237157c16778273550a38c70">
         <source>Most liked videos</source>
@@ -4884,7 +4856,7 @@
         <context-group name="null">
           <context context-type="linenumber">221</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">268</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">269</context></context-group>
       </trans-unit>
       <trans-unit id="93d74eb49a5e5c2af5f815178909adf425000af8">
         <source>Recently added videos</source>
@@ -4892,7 +4864,7 @@
         <context-group name="null">
           <context context-type="linenumber">222</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">269</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="b6307f83d9f43bff8d5129a7888e89964ddc3f7f">
         <source>Local videos</source>
@@ -4900,82 +4872,72 @@
         <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">
-        <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">
-        <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">
-        <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">
-        <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">
-        <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">
-        <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>
+        <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="translated">MEDDELANDE TILL ANVÄNDARE</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="3a10a32f96683addb9e1335cdba7d6685587fe6e" datatype="html">
+        <source>Display a message on your instance</source>
+        <target state="translated">Visa ett meddelande på din instans</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">283</context></context-group>
+      </trans-unit>
+      <trans-unit id="58be3e0a0ef272fbd6e715b44059c3d89b332d9b" datatype="html">
+        <source>Enable broadcast message</source>
+        <target state="translated">Aktivera meddelande till användare</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">295</context></context-group>
+      </trans-unit>
+      <trans-unit id="6938c4a91284a1bc8b61b0d8085d9985e46c9f5b" datatype="html">
+        <source>Allow users to dismiss the broadcast message</source>
+        <target state="translated">Tillåt användare att avfärda meddelandet</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">302</context></context-group>
+      </trans-unit>
+      <trans-unit id="dd24d21f2898608f623ae2513e1eb0a08a442f7a" datatype="html">
+        <source>Broadcast message level</source>
+        <target state="translated">Nivå för meddelande till användare</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">307</context></context-group>
+      </trans-unit>
+      <trans-unit id="ccac601bf473fa28c9ac46794f1cd40542f74347" datatype="html">
+        <source>Message</source>
+        <target state="translated">Meddelande</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">319</context></context-group>
       </trans-unit>
       <trans-unit id="0ea3c4f671addedc1fff64ba63adbf0629fab06a" datatype="html">
         <source>NEW USERS</source>
         <target state="translated">NYA ANVÄNDARE</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="translated">Hantera <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>användare<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> för att ange deras kvot individuellt. </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>Registrering aktiverad</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">
         <source>Signup requires email verification</source>
         <target>Registrering kräver e-postverifikation</target>
         <context-group name="null">
           <context context-type="linenumber">242</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">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>Registreringsgräns</target>
         <context-group name="null">
           <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="translated">Aktivera kontoregistrering</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>Användare</target>
@@ -5072,10 +5034,7 @@
       <trans-unit id="4a41f824a35ba01d5bd7be61aa06b3e8145209d0" datatype="html">
         <source>Configuration</source>
         <target state="translated">Konfiguration</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/admin.component.ts</context>
-          <context context-type="linenumber">1</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">1</context></context-group>
       </trans-unit>
       <trans-unit id="ec47d80e9b5608ecd396c32a46ca6b87601e7b20">
         <source>Default video quota per user</source>
@@ -5083,103 +5042,200 @@
         <context-group name="null">
           <context context-type="linenumber">261</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">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">
         <source>Default daily upload limit per user</source>
         <target>Standarduppladdningsgräns för användare</target>
         <context-group name="null">
           <context context-type="linenumber">273</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">384</context></context-group></trans-unit>
-      <trans-unit id="e8835d4b5abe1ae304ffaaea6e96bf49805f54a2" datatype="html">
-        <source>NEW VIDEOS</source>
-        <target state="translated">NYA VIDEOR</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="translated">Tillåt import via HTTP-länk (t.ex. 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="translated">Tillåt import via torrent-fil eller magnet-länk</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="translated">Såvida en användare inte har markerats som betrodd, kommer hans eller hennes videor hållas privata tills en moderater har granskat dem.</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="translated">Svartlista nya videor automatiskt</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="translated">Blockera nya videor automatiskt</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="translated">SÖKNING</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="translated">Låt <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>dina användare<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> använda en länk för att söka efter videor eller användare, även om fjärrinstansen inte är federerad med din instans</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="translated">Låt användare använda en länk för att göra fjärrsökningar</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="translated">Låt <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>anonyma användare<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> använda en länk för att söka efter videor eller användare, även om fjärrinstansen inte är federerad med din instans</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="translated">Låt anonyma användare använda en länk för att göra fjärrsökningar</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="translated">⚠️ Den här funktionen beror på hur väl den instanserna modereras i det sökregister du väljer.</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="translated">Du bör endast använda modererade sökregister i produktionsmiljön, alternativt <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>starta ett eget register<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="translated">Sökregistrets webbadress</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="translated">Avaktivera lokal sökning i sökrutan</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="translated">Annars används den lokala sökfunktionen som standard</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="translated">Sökrutan använder det globala sökregistret som standard</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="translated">Aktivera global sökning</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="translated">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="translated">Hantera <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>relationer<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> till andra instanser. </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="translated">Andra instanser kan följa din</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="translated">Godkänn instansens nya följare manuellt</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="translated">Följ, per automatik, instanser som följer din</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="translated">Du bör endast följa de indexeringar du litar på eller <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>starta ett eget index<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">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="translated">Du bör endast använda modererade register i produktionsmiljön, alternativt <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>starta ett eget register<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">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="translated">⚠️ Den här funktionen kräver mycket uppmärksamhet och 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">
         <source>Index URL</source>
-        <target>Index-URL</target>
+        <target>Register-URL</target>
         <context-group name="null">
           <context context-type="linenumber">371</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">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="translated">Följ instanser i ett offentligt index automatiskt</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>
+        <target state="translated">Följ instanser i ett offentligt register automatiskt</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">585</context></context-group>
+      </trans-unit>
       <trans-unit id="5805ff22d19f43016e2b1a0f7eff12185c78e89d" datatype="html">
         <source>ADMINISTRATORS</source>
         <target state="translated">ADMINISTRATÖRER</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>Administratör</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>
+        <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>
@@ -5187,124 +5243,127 @@
         <context-group name="null">
           <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">
         <source>Enable contact form</source>
         <target>Aktivera kontaktformulär</target>
         <context-group name="null">
           <context context-type="linenumber">398</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">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>Grundläggande inställningar</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>
+        <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="translated">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="translated">Valfritt. Om du har ett Twitter-konto som representerar din instans, kan du ange det för att förbättra förhandsvisningar av videolänkar.</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>Ditt användarnamn på Twitter</target>
         <context-group name="null">
           <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>Instans vitlistad av 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="translated">Instans godkänd av 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.
+                        to see if you instance is allowed.
                       </source>
-        <target state="translated">När du delar en videolänk och instansen är vitlistad av Twitter kommer en spelare bäddas in i Twitterflödet.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> Om instansen inte är vitlistad kommer vi använda ett bildkort som länkar till din PeerTube-instans.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> Kryssa i den här rutan, spara inställningarna och testa med en videolänk från din instans (https://example.com/videos/watch/blabla) på <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>"/> för att se om din instans är vitlistad. </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>
+        <target state="translated">När du delar en videolänk och instansen är godkänd av Twitter kommer en spelare bäddas in i Twitterflödet.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> Om instansen inte är godkänd kommer vi använda ett bildkort som länkar till din PeerTube-instans.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> Kryssa i den här rutan, spara inställningarna och testa med en videolänk från din instans (https://example.com/videos/watch/blabla) på <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>"/> för att se om din instans är godkänd. </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">679</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="419d940613972cc3fae9c8ea0a4306dbf80616e5">
         <source>Services</source>
         <target>Tjänster</target>
         <context-group name="null">
           <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="translated">OMKODNING</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
               resources, this is a critical part of PeerTube, so tread carefully.
             </source>
         <target state="translated">Behandla uppladdade videor till ett format som går att strömma från vilken apparat som helst. Det är dock mycket resurskrävande av servern och en mycket viktig del av PeerTube, så gå varsamt.</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>Omkodning aktiverad</target>
         <context-group name="null">
           <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>Om du avaktiverar omkodning, kommer många av dina användares videor inte fungera!</target>
         <context-group name="null">
           <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="translated">Låt användare ladda upp videor i mkv-, mov-, avi- and flv-format.</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">
         <source>Allow additional extensions</source>
         <target>Tillåt ytterligare filändelser</target>
         <context-group name="null">
           <context context-type="linenumber">475</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">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="translated">Låt användare ladda upp ljudfiler som slås ihop med förhandsgranskningens bild till en 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">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">
         <source>Allow audio files upload</source>
         <target>Tillåt uppladdning av ljudfiler</target>
         <context-group name="null">
           <context context-type="linenumber">486</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">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>"/>
@@ -5316,13 +5375,13 @@
                               <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>"/>
                             </source>
         <target state="translated"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Experimentellt, vi råder dig att behålla webtorrent-stödet ett tag till<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> <x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>"/>Om du även har HLS aktiverat kommer videorna kräva dubbelt så mycket lagringsutrymme<x id="CLOSE_PARAGRAPH" ctype="x-p" equiv-text="&lt;/p>"/> <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Utan webtorrent kan du inte federera med PeerTube-instanser med lägre versionsnummer än 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="translated">WebTorrent-stöd påslaget</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>"/>
@@ -5337,72 +5396,72 @@
                               <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>"/>
                             </source>
         <target state="translated"><x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>Kräver minst version >= 4.1<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/> av ffmpeg <x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>"/>Skapa en HLS-spellista och fragmenterade mp4-filer för bättre uppspelning än med den nuvarande standardspelaren:<x id="CLOSE_PARAGRAPH" ctype="x-p" equiv-text="&lt;/p>"/> <x id="START_UNORDERED_LIST" ctype="x-ul" equiv-text="&lt;ul>"/> <x id="START_LIST_ITEM" ctype="x-li" equiv-text="&lt;li>"/>Mjukare byten mellan upplösningar<x id="CLOSE_LIST_ITEM" ctype="x-li" equiv-text="&lt;/li>"/> <x id="START_LIST_ITEM" ctype="x-li" equiv-text="&lt;li>"/>Snabbare uppspelningar, särskilt för långa videor<x id="CLOSE_LIST_ITEM" ctype="x-li" equiv-text="&lt;/li>"/> <x id="START_LIST_ITEM" ctype="x-li" equiv-text="&lt;li>"/>Stabilare uppspelning (färre buggar samt obegränsad buffert)<x id="CLOSE_LIST_ITEM" ctype="x-li" equiv-text="&lt;/li>"/> <x id="CLOSE_UNORDERED_LIST" ctype="x-ul" equiv-text="&lt;/ul>"/> <x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>"/>Om du även stöder WebTorrent kommer varje video kräva dubbelt så mycket lagringsutryme<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">
-        <source>HLS support enabled</source>
-        <target>HLS-stöd aktiverat</target>
-        <context-group name="null">
-          <context context-type="linenumber">498</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">778</context></context-group>
+      </trans-unit>
+      <trans-unit id="5ac527cc856e9fa02927ccb0a6172688e07c1d7a" datatype="html">
+        <source>HLS with P2P support enabled</source>
+        <target state="translated">HLS med P2P-stöd är aktiverat</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>
-        
-      <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>
+      </trans-unit>
       <trans-unit id="a33feadefbb776217c2db96100736314f8b765c2">
         <source>Transcoding threads</source>
         <target>Omkodningstrådar</target>
         <context-group name="null">
           <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="translated">Upplösningar som ska genereras</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="translated">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="translated">Vissa filer federeras inte utan hämtas när så krävs. Ange deras cache-policy här.</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="translated">Antal förhandsvisningar som sparas i cachen</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="translated">Antal textningar som sparas i cachen</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="translated">ANPASSNINGAR</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="translated">Att göra mindre ändringar av PeerTube med ett tillägg eller tema är onödigt bekymmer.</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>
         <context-group name="null">
           <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="translated">Skriv ditt JavaScript här.<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('min instans är fantastisk');<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/>"/>
@@ -5417,142 +5476,101 @@
     <x id="CLOSE_TAG_PRE" ctype="x-pre" equiv-text="&lt;/pre>"/>
                       </source>
         <target state="translated">Skriv din CSS-kod här. Exempel:<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> <x id="START_TAG_PRE" ctype="x-pre" equiv-text="&lt;pre>"/> #custom-css <x id="INTERPOLATION" equiv-text="{{ '{' }}"/> color: red; <x id="INTERPOLATION_1" equiv-text="{{ '}' }}"/> <x id="CLOSE_TAG_PRE" ctype="x-pre" equiv-text="&lt;/pre>"/> Föregå med <x id="START_EMPHASISED_TEXT" ctype="x-em" equiv-text="&lt;em>"/>#custom-css<x id="CLOSE_EMPHASISED_TEXT" ctype="x-em" equiv-text="&lt;/em>"/> för att skriva över standardutseendet. Exempel:<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/><x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/> <x id="START_TAG_PRE" ctype="x-pre" equiv-text="&lt;pre>"/> #custom-css .logged-in-email <x id="INTERPOLATION" equiv-text="{{ '{' }}"/> color: red; <x id="INTERPOLATION_1" equiv-text="{{ '}' }}"/> <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>Avancerade inställningar</target>
         <context-group name="null">
           <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>Uppdatera inställningar</target>
         <context-group name="null">
           <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">
         <source>It seems like the configuration is invalid. Please search for potential errors in the different tabs.</source>
         <target>Det verkar som att konfigurationen inte stämmer. Sök efter eventuella fel i de olika flikarna.</target>
         <context-group name="null">
           <context context-type="linenumber">629</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">856</context></context-group></trans-unit>
-      <trans-unit id="824c2b28d0d9e771e3caf1d02021b740ac97076d" datatype="html">
-        <source>PROFILE</source>
-        <target state="translated">PROFIL</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>
+        <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="e09928fe11389fd1ea310890ba5dc9df05d53509" datatype="html">
         <source>VIDEO SETTINGS</source>
         <target state="translated">VIDEOINSTÄLLNINGAR</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">26</context></context-group></trans-unit>
       <trans-unit id="f70dbe547767b3a0f0006d44688beee60c884417" datatype="html">
         <source>NOTIFICATIONS</source>
         <target state="translated">NOTIFIKATIONER</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">37</context></context-group></trans-unit>
       <trans-unit id="8e4cafda991c13b5103e45195f7f2488974a913e" datatype="html">
         <source>INTERFACE</source>
         <target state="translated">GRÄNSSNITT</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">47</context></context-group></trans-unit>
       <trans-unit id="ce43cc343ed3bd908e593db994ca3f6dbff079df" datatype="html">
         <source>PASSWORD</source>
         <target state="translated">LÖSENORD</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>
-      <trans-unit id="d5e31741c591719630b5bba1ba38f8c1a04c10e3" datatype="html">
-        <source>EMAIL</source>
-        <target state="translated">E-POST</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">57</context></context-group></trans-unit>
+      <trans-unit id="d5e31741c591719630b5bba1ba38f8c1a04c10e3" datatype="html">
+        <source>EMAIL</source>
+        <target state="translated">E-POST</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">67</context></context-group></trans-unit>
       <trans-unit id="e6c299a11dadb59bf789ecc5d85eb1a1ebff4613" datatype="html">
         <source>DANGER ZONE</source>
         <target state="translated">FAROZON</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">77</context></context-group></trans-unit>
       <trans-unit id="994363f08f9fbfa3b3994ff7b35c6904fdff18d8">
         <source>Profile</source>
         <target>Profil</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/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/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="translated">Upplösning</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/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="translated">Höjd/bredd-förhållande</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/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="translated">Genomsnittlig bildhastighet</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/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="translated">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>
+        <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="translated">Samplingshastighet</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/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="translated">Utseende för kanaler</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/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="b5398623f87ee72ed23f5023918db1707771e925">
         <source>Video settings</source>
@@ -5560,12 +5578,12 @@
         <context-group name="null">
           <context context-type="linenumber">10</context>
         </context-group>
-        <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>
+        <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="translated">Gränssnittsinställningar</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>
+        <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">
         <source>Change password</source>
@@ -5606,7 +5624,7 @@
         <context-group name="null">
           <context context-type="linenumber">3</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">3</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">3</context></context-group>
       </trans-unit>
       <trans-unit id="8fbbb5d7bbc4df74ac19fe046f7b9d4f2fd80737">
         <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>
@@ -5616,29 +5634,23 @@
         <context-group name="null">
           <context context-type="linenumber">6</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">6</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">6</context></context-group>
       </trans-unit>
       <trans-unit id="be05139c85b590f407c8204605601ab510247f9f" datatype="html">
         <source>Policy for sensitive videos</source>
         <target state="translated">Policy för känsliga videor</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>
+        <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="translated">Visa endast videor och undertexter på följande språk</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>
+        <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="translated">På sidorna Nyligen tillagt, Lokalt, Mest gillade och Sök</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>
+        <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">
         <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>
@@ -5675,8 +5687,10 @@
           <context context-type="linenumber">17</context>
         </context-group>
         <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html</context><context context-type="linenumber">17</context></context-group>
-      </trans-unit><trans-unit id="3a83d433c5d27e1d06ece0475fac8ba409b6c9ac" datatype="html">
-        <source>Your current password</source><target state="new">Your current password</target>
+      </trans-unit>
+      <trans-unit id="3a83d433c5d27e1d06ece0475fac8ba409b6c9ac" datatype="html">
+        <source>Your current password</source>
+        <target state="translated">Ditt nuvarande lösenord</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html</context>
           <context context-type="linenumber">26</context>
@@ -5688,24 +5702,24 @@
         <context-group name="null">
           <context context-type="linenumber">27</context>
         </context-group>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html</context><context context-type="linenumber">28</context></context-group></trans-unit>
+        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html</context><context context-type="linenumber">28</context></context-group>
+      </trans-unit>
       <trans-unit id="820741079d4bc32fb98b7a871a6e507b18b6c85c">
         <source>Change email</source>
         <target>Byt e-postadress</target>
         <context-group name="null">
           <context context-type="linenumber">35</context>
         </context-group>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html</context><context context-type="linenumber">36</context></context-group></trans-unit>
+        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-change-email/my-account-change-email.component.html</context><context context-type="linenumber">36</context></context-group>
+      </trans-unit>
       <trans-unit id="27a56aad79d8b61269ed303f11664cc78bcc2522">
         <source>Theme</source>
         <target>Tema</target>
         <context-group name="null">
           <context context-type="linenumber">3</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">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>
+        <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">
         <source>instance default</source>
@@ -5713,7 +5727,7 @@
         <context-group name="null">
           <context context-type="linenumber">7</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">8</context></context-group>
+        <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">
         <source>peertube default</source>
@@ -5721,7 +5735,7 @@
         <context-group name="null">
           <context context-type="linenumber">8</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">9</context></context-group>
+        <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">
         <source>Change ownership</source>
@@ -5729,9 +5743,9 @@
         <context-group name="null">
           <context context-type="linenumber">22</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">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">41</context></context-group></trans-unit>
       <trans-unit id="046c4fa30411e6b1aa46dc51bf82d07b1adf14d4">
         <source>Select the next owner</source>
         <target>Välj nästa ägare</target>
@@ -5740,19 +5754,12 @@
         </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">10</context></context-group>
       </trans-unit>
-      <trans-unit id="7cb7f53b151a060db53d748d3973e345013f1af6" datatype="html">
-        <source>Videos <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/><x id="INTERPOLATION" equiv-text="{{ pagination.totalItems }}"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/></source>
-        <target state="translated">Videor <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/><x id="INTERPOLATION" equiv-text="{{ pagination.totalItems }}"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/></target>
-        <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">2</context>
-        </context-group>
-      </trans-unit>
+      
       <trans-unit id="addd26e1d0d8a38fcfceeb76642c6f838f9525e3" datatype="html">
         <source>Search your videos</source>
         <target state="translated">Sök bland dina videor</target>
-        <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">4</context></context-group>
-      </trans-unit>
+        
+      <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">11</context></context-group></trans-unit>
       <trans-unit id="fbc450919a486e8ed311a7e91a41987d47d83804">
         <source>Accept ownership</source>
         <target>Godkänn ägarskap</target>
@@ -5761,13 +5768,27 @@
         </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">3</context></context-group>
       </trans-unit>
-      <trans-unit id="4570c754149df06f31096510abfc925968c35562">
-        <source>Select the target channel</source>
-        <target>Välj målkanal</target>
-        <context-group name="null">
+      <trans-unit id="765e3847550ed5aab483c2a03f320090aa0a13f2" datatype="html">
+        <source>Select a channel to receive the video</source>
+        <target state="translated">Välj en kanal att överlåta videon till</target>
+        <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">10</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">10</context></context-group>
+      </trans-unit>
+      <trans-unit id="798f761c8cf39e72ad38f2237dac3a3ad33c6a30" datatype="html">
+        <source>Channel that will receive the video</source>
+        <target state="translated">Kanal som videon kommer överlåtas till</target>
+        <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">13</context>
+        </context-group>
+      </trans-unit><trans-unit id="e03a27ba50b0be207b4d17d044ab5ea300d70b43" datatype="html">
+        <source>My ownership changes</source><target state="new">My ownership changes</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">3</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="e98239d8a6be1100119ff4b5630c822b82786740">
         <source>Initiator</source>
@@ -5775,8 +5796,8 @@
         <context-group name="null">
           <context context-type="linenumber">13</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">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">19</context></context-group></trans-unit>
       <trans-unit id="b08d67fe4e192ea8352bebdc6aabbd1bb7abed02">
         <source>
         Created
@@ -5789,78 +5810,75 @@
         <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-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">21</context></context-group></trans-unit>
       <trans-unit id="81b97b8ea996ad1e4f9fca8415021850214884b1">
         <source>Status</source>
         <target>Status</target>
         <context-group name="null">
           <context context-type="linenumber">19</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">19</context></context-group>
-      </trans-unit>
-      <trans-unit id="1bd5e17c9582661e20763a7634ef07881e33bbd7">
-        <source>Action</source>
-        <target>Åtgärd</target>
-        <context-group name="null">
-          <context context-type="linenumber">20</context>
+        
+      <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">25</context></context-group></trans-unit>
+      
+      <trans-unit id="bde01505620f59f773377f94034e4038e6bd50c0" datatype="html">
+        <source>Account page</source>
+        <target state="translated">Kontosida</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">167</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">173</context></context-group></trans-unit><trans-unit id="e8a34c00da7e95d407a66f33f28943a480dbba82" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{ video.byAccount }}"/></source><target state="new"><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">174</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">20</context></context-group>
       </trans-unit>
-      <trans-unit id="f4212e793d36e1aaa6ee1b09881677f783b5feff">
-        <source><x id="INTERPOLATION" equiv-text="{{ videoChangeOwnership.status }}"/></source>
-        <target><x id="INTERPOLATION" equiv-text="{{ videoChangeOwnership.status }}"/></target>
-        <context-group name="null">
-          <context context-type="linenumber">38</context>
+      
+      <trans-unit id="cee3f34700944cc5786627e1b23073d946644620" datatype="html">
+        <source>No ownership change request found.</source>
+        <target state="translated">Det finns ingen begäran om ändring av ägarskap.</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">83</context></context-group></trans-unit><trans-unit id="bd751145ec934c2839fd6acffee05fbf439782ed" datatype="html">
+        <source>My imports</source><target state="new">My imports</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">3</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">38</context></context-group>
       </trans-unit>
+      
       <trans-unit id="574cce019fb31925d11095591d4321847ff1c7a5" datatype="html">
         <source>Create video channel</source>
         <target state="translated">Skapa videokanal</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">
-        <source>Go to the channel</source>
-        <target>Gå till kanalen</target>
-        <context-group name="null">
-          <context context-type="linenumber">10</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">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">19</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 }}"/> prenumeranter</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">32</context></context-group></trans-unit>
       <trans-unit id="915d4704e1649016512cbf5eeac55b4dbf933558">
         <source>Example: my_channel</source>
         <target>Exempel: min_kanal</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-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>
+        <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="translated">KANAL</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>
+        <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="translated">En kort text som berättar hur andra kan stötta din kanal (t.ex. medlemskap på någon plattform).&lt;br />&lt;br /> När du laddar upp en video till den här kanalen kommer videons supportruta fyllas i med den här texten automatiskt.</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>
+        <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">
         <source>Overwrite support field of all videos of this channel</source>
@@ -5868,8 +5886,8 @@
         <context-group name="null">
           <context context-type="linenumber">67</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>
-        <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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{ actor.followersCount }}"/> subscribers</source>
@@ -5877,7 +5895,7 @@
         <context-group name="null">
           <context context-type="linenumber">10</context>
         </context-group>
-        <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>
+        <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">
         <source>Target</source>
@@ -5885,18 +5903,23 @@
         <context-group name="null">
           <context context-type="linenumber">8</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">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">17</context></context-group></trans-unit>
       <trans-unit id="a5707e9905e079605243397ee111b8be449941aa" datatype="html">
         <source>See the error</source>
         <target state="translated">Visa felet</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">27</context></context-group></trans-unit>
       <trans-unit id="842b1f5e4942fb515ef790308ca9ea6a60b4b331" datatype="html">
         <source>This video was deleted</source>
         <target state="translated">Den här videon har raderats</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">49</context></context-group></trans-unit>
+      <trans-unit id="a86239658c3cf042e7c987bb0df7473a53d7517e" 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}'}}"/> imports</source>
+        <target state="translated">Visar import <x id="INTERPOLATION" equiv-text="{{'{first}'}}"/> till <x id="INTERPOLATION_1" equiv-text="{{'{last}'}}"/> av <x id="INTERPOLATION_2" equiv-text="{{'{totalRecords}'}}"/></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">10</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="translated">Om du raderar ditt konto kan det inte återskapas. Du kommer bli ombedd att bekräfta åtgärden.</target>
@@ -5919,41 +5942,41 @@
         <context-group name="null">
           <context context-type="linenumber">1</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>
+        
+      <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="f886abe6ca73a34403dde0578e71173cebe00428" datatype="html">
+        <source>Channel page</source>
+        <target state="translated">Kanalsida</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">27</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">30</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">164</context></context-group></trans-unit>
       <trans-unit id="c65641c36859c328928e6b0f14c3f913886f8add">
         <source>Created by <x id="INTERPOLATION" equiv-text="{{ videoChannel.ownerBy }}"/></source>
         <target>Skapad av <x id="INTERPOLATION" equiv-text="{{ videoChannel.ownerBy }}"/></target>
         <context-group name="null">
           <context context-type="linenumber">17</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">18</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">35</context></context-group></trans-unit>
+      <trans-unit id="cd2d9bfd5a5f7bdc1d4f1242e8a35d74830b6ffe" datatype="html">
+        <source>Owner account page</source>
+        <target state="translated">Ägarens kontosida</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">34</context></context-group></trans-unit>
       <trans-unit id="e006ed166ce188cab168e1ca90435b33d042d913">
         <source>Go the owner account page</source>
         <target>Gå till ägarens kontosida</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-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">
-        <source>Muted instances</source>
-        <target>Ignorerade instanser</target>
-        <context-group name="null">
-          <context context-type="linenumber">2</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">2</context></context-group>
-      </trans-unit>
       <trans-unit id="cb6fc818d4547d66ac5ea65f2c5d5cbfb6ebc04e" datatype="html">
         <source>Video history</source>
         <target state="translated">Videohistorik</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">9</context></context-group></trans-unit>
       <trans-unit id="29c45bf49891748f930ef78b2e09857498b15131">
         <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>"/>
@@ -5966,16 +5989,13 @@
         <context-group name="null">
           <context context-type="linenumber">7</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">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">12</context></context-group></trans-unit>
       <trans-unit id="355c9f9d50ed1c6f12729332a44c1fd0f7576638" datatype="html">
         <source>You don't have any video history yet.</source>
         <target state="translated">Du har inte någon videohistorik än.</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">19</context></context-group></trans-unit>
       <trans-unit id="9d2d802fa417a5a3f230cb5bcc975551a252c59c">
         <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>"/>
@@ -5988,13 +6008,25 @@
         <context-group name="null">
           <context context-type="linenumber">2</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">2</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">3</context></context-group>
+      </trans-unit><trans-unit id="e7f88c481ecdda90467acd3f4dbe934465cee30f" datatype="html">
+        <source>Newest first</source><target state="new">Newest first</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">11</context>
+        </context-group>
+      </trans-unit><trans-unit id="a05dac5ded54ab304817a823693e2af2ad1cffef" datatype="html">
+        <source>Unread first</source><target state="new">Unread first</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">12</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="58479ebfcc980e1ee37a8102bc4f9a35eca2f680" datatype="html">
         <source>All read</source>
         <target state="translated">Alla lästa</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">26</context></context-group></trans-unit>
       <trans-unit id="dd3b6c367381ddfa8f317b8e9b31c55368c65136">
         <source>Activities</source>
         <target>Aktiviteter</target>
@@ -6050,30 +6082,23 @@
       <trans-unit id="61b31fe7bfae807e3ccc0dbf001c6dc9b72aaf19" datatype="html">
         <source>Create playlist</source>
         <target state="translated">Skapa spellista</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.html</context><context context-type="linenumber">8</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.html</context><context context-type="linenumber">18</context></context-group></trans-unit>
       <trans-unit id="88f1b36ea2f7544792f04ee6b58f8c55aaba5c96">
         <source>Playlist thumbnail</source>
         <target>Miniatyrbild för spellista</target>
         <context-group name="null">
           <context context-type="linenumber">60</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">84</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">84</context></context-group>
-      </trans-unit>
-      <trans-unit id="a808c932c8ac3cac864f214734b6899568d6c976" datatype="html">
-        <source>Playlists <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/><x id="INTERPOLATION" equiv-text="{{ pagination.totalItems }}"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/></source>
-        <target state="translated">Spellistor <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/><x id="INTERPOLATION" equiv-text="{{ pagination.totalItems }}"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlists.component.html</context>
-          <context context-type="linenumber">2</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">85</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">85</context></context-group>
       </trans-unit>
+      
       <trans-unit id="a85c7d7a8dcc1ae0d2f945d77f4db36f02ead69b" datatype="html">
         <source>Search your playlists</source>
         <target state="translated">Sök bland dina spellistor</target>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-video-playlists/my-account-video-playlists.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-playlists/my-account-video-playlists.component.html</context><context context-type="linenumber">10</context></context-group></trans-unit>
       <trans-unit id="188014887f7188d90b39e41d9606b91c77c17861">
         <source>No videos in this playlist.</source>
         <target>Det finns inga videor i den här spellistan.</target>
@@ -6198,49 +6223,39 @@
       <trans-unit id="1b9099f59dd3baaeeaac2c29fe653dc1b0436157" datatype="html">
         <source>Manage account</source>
         <target state="translated">Hantera konto</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+accounts/accounts.component.html</context>
-          <context context-type="linenumber">35</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/accounts.component.html</context><context context-type="linenumber">36</context></context-group></trans-unit>
       <trans-unit id="87f77a03c185ea644ed8378a562a2d0225513974">
         <source>This account does not have channels.</source>
         <target>Det här kontot har inga kanaler.</target>
         <context-group name="null">
           <context context-type="linenumber">3</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">3</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">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="translated">{VAR_PLURAL, plural, =1 {1 prenumerant} other {<x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount }}"/> prenumeranter} }</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>
-      </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">35</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="translated">{VAR_PLURAL, plural, =0 {Inga videor} =1 {1 video} other {<x id="INTERPOLATION" equiv-text="{{ videoChannel.videosCount }}"/> videor} }</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">37</context></context-group></trans-unit>
       <trans-unit id="d5f0913d08d01648d7e6165c168a99ccd06d1f4c" datatype="html">
         <source>My Channels</source>
         <target state="translated">Mina kanaler</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>
+        <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="translated">NY KANAL</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>
+        <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>
@@ -6248,47 +6263,29 @@
         <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>
+        <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="translated">Den här kanalen har inga videor.</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>
+        <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="translated">VISA DEN HÄR KANALEN</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>
+        <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="translated">BESKRIVNING</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>
+        <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="translated">STATISTIK</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>
+        <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>
@@ -6298,18 +6295,13 @@
         </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="translated">PeerTubes licens</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>Gick med <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>
+        <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>
@@ -6330,10 +6322,7 @@
       <trans-unit id="b8bf6036a9fb05c08cdb190cdf4e3becc6e6fa0a" datatype="html">
         <source>SUPPORT THIS CHANNEL</source>
         <target state="translated">STÖD DEN HÄR KANALEN</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>
+        <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">
         <source>Created <x id="INTERPOLATION" equiv-text="{{ videoChannel.createdAt | date }}"/></source>
@@ -6341,17 +6330,15 @@
         <context-group name="null">
           <context context-type="linenumber">17</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>
+        <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="c286611c692d1442f8536ae6e62becbd28413d0e">
+      <trans-unit id="5ebd76e736e1c58a1850234d1d26f1ab8c9ad11f" datatype="html">
         <source>Created <x id="INTERPOLATION" equiv-text="{{ pagination.totalItems }}"/> playlists </source>
-        <target>
-  Skapade <x id="INTERPOLATION" equiv-text="{{ pagination.totalItems }}"/> spellistor
-</target>
-        <context-group name="null">
-          <context context-type="linenumber">1</context>
+        <target state="translated">Skapade <x id="INTERPOLATION" equiv-text="{{ pagination.totalItems }}"/> spellistor </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">2</context>
         </context-group>
-        <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-group>
       </trans-unit>
       <trans-unit id="fbbe62dee434f0521e0dfb8e3957d92fc5fcd76f">
         <source>This channel does not have playlists.</source>
@@ -6359,7 +6346,7 @@
         <context-group name="null">
           <context context-type="linenumber">5</context>
         </context-group>
-        <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>
+        <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>
@@ -6376,6 +6363,7 @@
           <context context-type="linenumber">9</context>
         </context-group>
         <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">
         <source>Contact <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> administrator</source>
@@ -6513,13 +6501,21 @@
         </context-group>
         <context-group purpose="location"><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="translated">FUNKTIONER</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>
         <target>Funktioner på den här instansen</target>
         <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/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">
@@ -6537,18 +6533,15 @@
           <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
-      </trans-unit><trans-unit id="49ea58bdafe3b72efaa42bac13d7d9b2f22a2990" datatype="html">
-        <source>
-      PeerTube is a self-hosted ActivityPub-federated video streaming platform using P2P directly in your web browser.
-    </source><target state="new">
-      PeerTube is a self-hosted ActivityPub-federated video streaming platform using P2P directly in your web browser.
-    </target>
+      </trans-unit>
+      <trans-unit id="49ea58bdafe3b72efaa42bac13d7d9b2f22a2990" datatype="html">
+        <source>PeerTube is a self-hosted ActivityPub-federated video streaming platform using P2P directly in your web browser.</source>
+        <target state="translated">PeerTube är en självservad, ActivityPub-federerad videoplattform med P2P direkt i webbläsaren.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit>
-      
       <trans-unit id="6469b375536342370eefd959bb72a06dc3d5884b" datatype="html">
         <source>
       It is a free and open-source software, under the <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>AGPLv3
@@ -6791,38 +6784,26 @@
       <trans-unit id="eebbc9b6d037b9c08225b769a5f3f333b2789500" datatype="html">
         <source>Followers instances</source>
         <target state="translated">Följare</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>
+        <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="translated">Den här instansen följs inte av någon annan instans.</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>
+        <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="translated">Följer</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>
+        <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="translated">Den här instansen följer inte några andra instanser.</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>
+        <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="translated">Utvecklat med ❤ 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>
+        <target state="translated">Utvecklat med ❤ av <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Framasoft<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/></target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube-contributors.component.html</context>
           <context context-type="linenumber">3</context>
@@ -6904,6 +6885,14 @@
         </context-group>
         <context-group purpose="location"><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="translated">Steg</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">
         <source>
       A channel is an entity in which you upload your videos. Creating several of them helps you to organize and separate your content.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
@@ -7054,6 +7043,12 @@
           <context context-type="sourcefile">src/app/+accounts/accounts.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
+      </trans-unit><trans-unit id="354beccb6ece15dc6c2404c098c5a6edad22ccb4" datatype="html">
+        <source>Report account</source><target state="new">Report account</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+accounts/accounts.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="55d67844f534a75a89f86bb19d51c0703280a6ad" datatype="html">
         <source>VIDEO CHANNELS</source>
@@ -7092,6 +7087,16 @@
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="db28493f1be1ed4d0edfea612181d27c9c530270" datatype="html">
+        <source>Instances you follow</source>
+        <target state="translated">Instanser du följer</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/following-list/following-list.component.html</context><context context-type="linenumber">3</context></context-group></trans-unit>
+      <trans-unit id="5bd2577f482e8ac75e9fd9970c58b7f4b2995e56" datatype="html">
+        <source>Instances following you</source>
+        <target state="translated">Instanser som följer dig</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/follows/followers-list/followers-list.component.html</context><context context-type="linenumber">3</context></context-group></trans-unit>
       <trans-unit id="00437b281d12d04c60a57bd329cff5e3c5febd93" datatype="html">
         <source>Audio-only</source>
         <target state="translated">Endast ljud</target>
@@ -7179,7 +7184,7 @@
           <context context-type="linenumber">1</context>
         </context-group>
         <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>
+        <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">
         <source>No language</source>
@@ -7188,7 +7193,7 @@
           <context context-type="linenumber">1</context>
         </context-group>
         <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>
+        <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">
         <source>{{'{0} categories selected</source>
@@ -7209,34 +7214,40 @@
       <trans-unit id="67e703146fe9f6fa41250bbdf27db405cee57607" datatype="html">
         <source>Process domains</source>
         <target state="translated">Behandla domäner</target>
+        <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="8d28bfade01c1a7e67f814aab2a50cab57f8cce6" datatype="html">
+        <source>Report <x id="INTERPOLATION" equiv-text="{{displayName}}"/></source><target state="new">Report <x id="INTERPOLATION" equiv-text="{{displayName}}"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/account-report.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="e77f882caa0127df757787c55d75cb0c2ca52df0" datatype="html">
+        <source>Account reported.</source><target state="new">Account reported.</target>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/shared/batch-domains-modal.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/account-report.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="7a706fc3bc6d88738c42746f4f87381e403fa5b1" datatype="html">
+        <source>Comment reported.</source><target state="new">Comment reported.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/comment-report.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="translated">Domän måste uppges.</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>
+        <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="translated">Angivna domäner är ogiltiga.</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>
+        <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="translated">Domänerna innehåller dubbletter.</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>
+        <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">
         <source>Unlimited</source>
@@ -7244,11 +7255,12 @@
         <context-group name="null">
           <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/+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/shared/shared-main/users/user-quota.component.ts</context><context context-type="linenumber">1</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-main/users/user-quota.component.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="translated">Ingen – uppladdning är inte tillåten</target>
@@ -7390,7 +7402,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Follow request(s) sent!</source>
@@ -7494,7 +7506,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted by your instance.</source>
@@ -7502,145 +7514,245 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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="cf70037e436f2c5547cbdf1a02e1348c8642467a" datatype="html">
-        <source>Instance <x id="INTERPOLATION" equiv-text="{{domain}}"/> muted by your instance.</source>
-        <target state="translated">Instansen <x id="INTERPOLATION" equiv-text="{{domain}}"/> ignoreras av din instans.</target>
+      <trans-unit id="366c51268cf18a834e6207b2efe20b679f3796ef" datatype="html">
+        <source>Instance <x id="INTERPOLATION" equiv-text="{{domain}}"/> muted.</source>
+        <target state="translated">Instansen <x id="INTERPOLATION" equiv-text="{{domain}}"/> kommer ignoreras.</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="translated">Instansen <x id="INTERPOLATION" equiv-text="{{domain}}"/> ignoreras av din instans.</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="800cd3cdf47751b576587259ba3a1bc0a7f435b6">
         <source>Comment updated.</source>
         <target>Kommentaren har uppdaterats.</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><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="translated">Interna åtgärder</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="0db581a9122258b2897ad3e915e2d00d7f6d33f5" datatype="html">
-        <source>Delete report</source>
-        <target state="translated">Radera anmälan</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/moderation-comment-modal.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="79b1fff8643eb798e40e0884336e0a6097b9aae6" datatype="html">
+        <source>Violent or Repulsive</source>
+        <target state="translated">Våldsamt eller motbjudande</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/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="translated">Hatiskt eller nedsättande</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/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="translated">Spam eller vilseledande</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-details.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="cc82fa89983785cb60daa0a7516c611fc02b5cd1" datatype="html">
+        <source>Copyright</source><target state="new">Copyright</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/shared/shared-abuse-list/abuse-details.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="513acd6a54ffb7c9c494cfcac42a161aa12e69fe" datatype="html">
-        <source>Add note</source>
-        <target state="translated">Lägg till kommentar</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/shared/shared-moderation/abuse.service.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="9fb13da3d22d6216b8a5a9c63777c9c0c506c7eb" datatype="html">
-        <source>Update note</source>
-        <target state="translated">Uppdatera kommentar</target>
+      
+      <trans-unit id="c3f2b3cc8e38a972f97d5be54b5f4e87fda1b964" datatype="html">
+        <source>Server rules</source>
+        <target state="translated">Serverregler</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/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="translated">Miniatyrbilder</target>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/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/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="37682f69f05be054bd72b44947af150734e302c3" datatype="html">
+        <source>Internal actions</source>
+        <target state="translated">Interna åtgärder</target>
+        
+        
+      <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-abuse-list/abuse-list-table.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="translated">Radera anmälan</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="6033077c090e29fd4bc322aafaa92044d55a7483" datatype="html">
+        <source>Actions for the flagged account</source><target state="new">Actions for the flagged account</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/shared/shared-abuse-list/abuse-list-table.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      
+      
       <trans-unit id="d512430037b6580ba970c80cfc1687b6bdc221a3">
         <source>Mark as accepted</source>
         <target>Markera som godkänd</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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-abuse-list/abuse-list-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="d895b090c054bfc0ad3aba816af0615a1997f5a3">
         <source>Mark as rejected</source>
         <target>Markera som nekad</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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="0e546f4a26ddb8a098fb5c8db211ab44d8f2966b" datatype="html">
-        <source>Actions for the video</source>
-        <target state="translated">Åtgärder för videon</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="bc71eae6f8c2a11dc6fc78924d32bf3001d0f1c3" datatype="html">
+        <source>Add internal note</source><target state="new">Add internal note</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/shared/shared-abuse-list/abuse-list-table.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="0e546f4a26ddb8a098fb5c8db211ab44d8f2966b" datatype="html">
+        <source>Actions for the video</source>
+        <target state="translated">Åtgärder för videon</target>
+        
+        
+      <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-abuse-list/abuse-list-table.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="translated">Blockera video</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.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="translated">Video blockerad.</target>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.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="translated">Häv videons blockering</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.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="translated">Blockering hävd.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="73b70e37cddaa6494d8a666b6cba90dc80595599">
         <source>Do you really want to delete this abuse report?</source>
         <target>Vill du verkligen radera den här missbruksanmälan?</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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-abuse-list/abuse-list-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="6a7938b8780c27540ea70cc0f8f4d928c8916cf9">
         <source>Abuse deleted.</source>
         <target>Missbruksanmälan raderad.</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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-abuse-list/abuse-list-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="024ef05e4a377cbb240923dc8e89ebdbe959f1bc" datatype="html">
+        <source>Deleted comment</source><target state="new">Deleted comment</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="2b72c92d53400c2c031b4b5f7a2af05b0e040e14" datatype="html">
+        <source>Messages with reporter</source><target state="new">Messages with reporter</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="e032e8aca0297ef06d7252ea5db67e008261e705" datatype="html">
+        <source>Messages with moderators</source><target state="new">Messages with moderators</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="a1b2af7a6b3ff5453fef73750cd89c8613f6a1d6" datatype="html">
+        <source>Update internal note</source><target state="new">Update internal note</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
       </trans-unit>
-      <trans-unit id="36e4cdb23056253e5ef0c62b7d4bbeb3f759f611">
-        <source>Video <x id="INTERPOLATION" equiv-text="{{name}}"/> removed from blacklist.</source>
-        <target>Videon <x id="INTERPOLATION" equiv-text="{{name}}"/> har tagits bort från svartlistan.</target>
-        <context-group name="null">
+      <trans-unit id="5801b59834422f97fa2a5c930f079611ea040ccb" datatype="html">
+        <source>Switch video block to manual</source>
+        <target state="translated">Byt till manuell blockering</target>
+        <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/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
-      <trans-unit id="3d651e314544825348900b3120e2cd5ff38c7fa5">
-        <source><x id="INTERPOLATION" equiv-text="{{num}}"/> videos removed from blacklist.</source>
-        <target><x id="INTERPOLATION" equiv-text="{{num}}"/> videor har tagits bort från svartlistan.</target>
-        <context-group name="null">
+      <trans-unit id="47297c5c574f8d6fec71af7f24818b52761f9b21" datatype="html">
+        <source>Video <x id="INTERPOLATION" equiv-text="{{name}}"/> switched to manual block.</source>
+        <target state="translated">Videon <x id="INTERPOLATION" equiv-text="{{name}}"/> är nu manuellt blockerad.</target>
+        <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/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
-      <trans-unit id="0594812d4c50c2adbd1a892a3497c4e5c19e4b32">
-        <source>yes</source>
-        <target>ja</target>
-        <context-group name="null">
+      <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="translated">Vill du verkligen häva den här videons blockering? Detta kommer göra den synlig igen i videokatalogen.</target>
+        <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>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
-      <trans-unit id="6320692861e01fa9c9d4e692d0d27b6c12b21c3b">
-        <source>no</source>
-        <target>nej</target>
-        <context-group name="null">
+      <trans-unit id="350850e095bb1b8d7dcc99b520d5ec8132c710fb" datatype="html">
+        <source>Unblock</source>
+        <target state="translated">Häv blockering</target>
+        <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>
+        <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="0f39df26589693fe43b6bd5c4602bc4fc6ac1226" datatype="html">
+        <source>Video <x id="INTERPOLATION" equiv-text="{{name}}"/> unblocked.</source>
+        <target state="translated">Videon <x id="INTERPOLATION" equiv-text="{{name}}"/> är inte längre blockerad.</target>
+        <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>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
-      <trans-unit id="652845b2b32b2e117b9b02879b1af07859b0e223">
-        <source>Do you really want to remove this video from the blacklist? It will be available again in the videos list.</source>
-        <target>Vill du verkligen ta bort den här videon från svartlistan? Den kommer i så fall skrivas upp på videolistan igen.</target>
+      <trans-unit id="0594812d4c50c2adbd1a892a3497c4e5c19e4b32">
+        <source>yes</source>
+        <target>ja</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-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>
+        <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="1585babc36806e20e225ac27dbba0e7c7cd09e0f">
-        <source>Video <x id="INTERPOLATION" equiv-text="{{name}}"/> removed from the blacklist.</source>
-        <target>Videon <x id="INTERPOLATION" equiv-text="{{name}}"/> har tagits bort från svartlistan.</target>
+      <trans-unit id="6320692861e01fa9c9d4e692d0d27b6c12b21c3b">
+        <source>no</source>
+        <target>nej</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-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>
+        <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">
         <source>You don't have plugins installed yet.</source>
@@ -7802,7 +7914,7 @@
           <context context-type="linenumber">1</context>
         </context-group>
         <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>
+        <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">
         <source>Error</source>
@@ -7881,26 +7993,14 @@
       <trans-unit id="a3f529c8552196571418065c5b81a44ae2f94972" datatype="html">
         <source>Videos will be deleted, comments will be tombstoned.</source>
         <target state="translated">Videorna kommer raderas och kommentarerna arkiverade.</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>
+        <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="translated">Användare kommer inte längre kunna logga in, men videor och kommentarer kommer behållas så som de är.</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>
+        <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">
         <source>Unban</source>
@@ -7910,8 +8010,7 @@
         </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/+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>
+        <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">
         <source>Set Email as Verified</source>
@@ -7920,7 +8019,7 @@
           <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/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="ac401df84c5fa471700c3368de51c969ccb8bacf">
         <source>You cannot ban root.</source>
@@ -7929,7 +8028,7 @@
           <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/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="98119091712a8ca72905e3b4c1cf60649af7565e">
         <source>Do you really want to unban <x id="INTERPOLATION" equiv-text="{{num}}"/> users?</source>
@@ -7954,7 +8053,7 @@
           <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/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="9de914fe915cc730efc57e81c987188a24d3ac51">
         <source>If you remove these users, you will not be able to create others with the same username!</source>
@@ -7986,8 +8085,8 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted.</source>
@@ -7995,8 +8094,8 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>My videos history</source>
@@ -8125,7 +8224,8 @@
         <context-group name="null">
           <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-interface/my-account-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>
+        <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">
         <source>New video from your subscriptions</source>
@@ -8142,30 +8242,29 @@
           <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-notification-preferences/my-account-notification-preferences.component.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
-      <trans-unit id="f536b58345161afa5cd859cce5a0b66a39327ad8">
-        <source>New video abuse</source>
-        <target>Ny missbruksanmälan</target>
-        <context-group name="null">
+      </trans-unit><trans-unit id="babf107e751eccfe9ddccda72e47f5b2f479f946" datatype="html">
+        <source>New abuse</source><target state="new">New abuse</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>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
-      <trans-unit id="051dd48c3e6254785c6f366656aaee58f8b46c47">
-        <source>Video auto-blacklisted waiting review</source>
-        <target>En video har svartlistats automatiskt och inväntar granskning</target>
-        <context-group name="null">
+      
+      <trans-unit id="f4f29b22904c1ee350555ce58c2380ad58a39e06" datatype="html">
+        <source>Video blocked automatically waiting review</source>
+        <target state="translated">En automatiskt blockerad video inväntar granskning</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>
-        <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">
-        <source>One of your video is blacklisted/unblacklisted</source>
-        <target>En av dina videor har antingen svartlistats eller är inte längre svartlistad</target>
-        <context-group name="null">
+      <trans-unit id="47f529a2dcb30ef1533d978ac01dbd361b0b6be7" datatype="html">
+        <source>One of your video is blocked/unblocked</source>
+        <target state="translated">En av dina videor ändrat blockeringsstatus</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>
-        <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">
         <source>Video published (after transcoding/scheduled update)</source>
@@ -8214,15 +8313,26 @@
           <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-notification-preferences/my-account-notification-preferences.component.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
-      <trans-unit id="516cb5fae75f1c90af643abf6c66bf58787c0869" datatype="html">
-        <source>Your instance auto followed another instance</source>
-        <target state="translated">Din instans började följa en annan automatiskt</target>
+      </trans-unit><trans-unit id="1fd315296ec2e0a4bfe416c281b28303ea7fe253" datatype="html">
+        <source>Your instance automatically followed another instance</source><target state="new">Your instance automatically followed another instance</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="71bd854cef3050ed5a0bc631111b5389f70fde84" datatype="html">
+        <source>An abuse report received a new message</source><target state="new">An abuse report received a new message</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="0c3de84b1acdb6a070878426217bde6b503f01a9" datatype="html">
+        <source>One of your abuse reports has been accepted or rejected by moderators</source><target state="new">One of your abuse reports has been accepted or rejected by moderators</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="a0f04081717f5f00c0a2c723903c3a2d4c296401">
         <source>Preferences saved</source>
         <target>Inställningar sparade</target>
@@ -8245,8 +8355,16 @@
         <context-group name="null">
           <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="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-video-channels/my-account-video-channel-update.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="translated">Vill du verkligen radera <x id="INTERPOLATION" equiv-text="{{channelDisplayName}}"/>? Om du gör det, kommer <x id="INTERPOLATION_1" equiv-text="{{videosCount}}"/> videor som har laddats upp till den här kanalen raderas och du kommer inte kunna skapa en ny kanal med samma namn (<x id="INTERPOLATION_2" 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>
       <trans-unit id="96d143e59c90c4f479eb7a3b55e2a24dc676b31f">
         <source>Unknown language</source>
@@ -8254,7 +8372,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Video settings updated.</source>
@@ -8262,15 +8380,12 @@
         <context-group name="null">
           <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>
+        <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="translated">Inställningarna för videor eller visning har ändrats.</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>
+        <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">
         <source>Video channel <x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/> created.</source>
@@ -8278,7 +8393,7 @@
         <context-group name="null">
           <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-create.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-create.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="f359f6adf6cccca7770019f947ed594169ee7d47">
         <source>This name already exists on this instance.</source>
@@ -8286,7 +8401,7 @@
         <context-group name="null">
           <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-create.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-create.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="98ab64f0af924a60a48b40835c1b655bd17c6559">
         <source>Video channel <x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/> updated.</source>
@@ -8294,15 +8409,7 @@
         <context-group name="null">
           <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="linenumber">1</context></context-group>
-      </trans-unit>
-      <trans-unit id="4e613272923d6f1976e3c73e8b857ac45c37b791">
-        <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>Vill du verkligen radera <x id="INTERPOLATION" equiv-text="{{channelDisplayName}}"/>? Om du gör det kommer alla videor som laddats upp till kanalen tas bort och du kommer inte kunna skapa en ny kanal med samma namn (<x id="INTERPOLATION_1" equiv-text="{{channelName}}"/>)!</target>
-        <context-group name="null">
-          <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-channels.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="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="3859ca2a7577ba8797058d7d97eb8054bc56ec99">
         <source>Please type the display name of the video channel (<x id="INTERPOLATION" equiv-text="{{displayName}}"/>) to confirm</source>
@@ -8310,7 +8417,7 @@
         <context-group name="null">
           <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-channels.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-channels.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="a81a33275b683729ad938b6102e7e34a057537a2">
         <source>Video channel <x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/> deleted.</source>
@@ -8318,15 +8425,12 @@
         <context-group name="null">
           <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-channels.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-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="translated">Visningar idag</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>
+        <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">
         <source>Playlist <x id="INTERPOLATION" equiv-text="{{playlistName}}"/> created.</source>
@@ -8366,9 +8470,9 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/+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-videos/my-account-videos.component.html</context><context context-type="linenumber">4</context></context-group></trans-unit>
       <trans-unit id="00e16d1f1c5cc936ec0881cd02cbf66aa1b4cddd">
         <source>Do you really want to delete <x id="INTERPOLATION" equiv-text="{{deleteLength}}"/> videos?</source>
         <target>Vill du verkligen radera <x id="INTERPOLATION" equiv-text="{{deleteLength}}"/> videor?</target>
@@ -8400,7 +8504,7 @@
           <context context-type="linenumber">1</context>
         </context-group>
         <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>
+        <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">
         <source>Ownership change request sent.</source>
@@ -8416,7 +8520,13 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        
+      <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="6749bdfd88a223fd464a9b09541342fbf42a0ad6" datatype="html">
+        <source>Search your channels</source><target state="new">Search your channels</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">11</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="1d3408919f4d08414721cc22c4be39d93d6691d2">
         <source>My playlists</source>
@@ -8424,15 +8534,21 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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-playlists/my-account-video-playlists.component.html</context><context context-type="linenumber">4</context></context-group></trans-unit>
       <trans-unit id="29038e66547b3ba70701fb34eda68834a56f17d9">
         <source>My subscriptions</source>
         <target>Mina prenumerationer</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        
+      <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">4</context></context-group></trans-unit><trans-unit id="31e313e20810b296cb7cc389fd7a3736cff7df44" datatype="html">
+        <source>Search your subscriptions</source><target state="new">Search your subscriptions</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">11</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="4f953496ca94b4f83af049ff715172df2729fb79">
         <source>My history</source>
@@ -8440,8 +8556,8 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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-history/my-account-history.component.html</context><context context-type="linenumber">3</context></context-group></trans-unit>
       <trans-unit id="46aa32e581922d6d2c3d7bc4c87209ad5808b029">
         <source>Misc</source>
         <target>Diverse</target>
@@ -8449,6 +8565,12 @@
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account.component.ts</context><context context-type="linenumber">1</context></context-group>
+      </trans-unit><trans-unit id="e0e5e0c1024485578c73f4b13ec122a2fbc884c6" datatype="html">
+        <source>My abuse reports</source><target state="new">My abuse reports</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>
       <trans-unit id="73022f1676784c4f9b8cdbb322e52b02ccc800b7">
         <source>Ownership changes</source>
@@ -8456,8 +8578,8 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="efad4be364b8fb5c73cbfcc7acccd542f9d84ad6">
         <source>My settings</source>
         <target>Mina inställningar</target>
@@ -8477,8 +8599,8 @@
       <trans-unit id="de4bfcfa89604c153a4a07920642de55464425be" datatype="html">
         <source>max size</source>
         <target state="translated">största tillåtna storlek</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>
+        <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">
         <source>Now please check your emails to verify your account and complete signup.</source>
@@ -8510,8 +8632,8 @@
         <context-group name="null">
           <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>
         <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>
       <trans-unit id="2f03e577e8f81a9f8be0095f93e1f9376c6eedc9">
         <source>Published videos</source>
@@ -8536,7 +8658,7 @@
           <context context-type="linenumber">1</context>
         </context-group>
         <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>
+        <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>
@@ -8681,23 +8803,20 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.ts</context><context context-type="linenumber">1</context></context-group>
+        <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">
-        <source>You account is blocked.</source>
-        <target>Ditt konto har blockerats.</target>
-        <context-group name="null">
+      <trans-unit id="4e6f8ebb0c0d4c19e4bf60bd907fcaa9740607af" datatype="html">
+        <source>Your account is blocked.</source>
+        <target state="translated">Ditt konto har blockerats.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+login/login.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-        <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="translated">Instruktioner för att återställa lösenordet kommer skickas till <x id="INTERPOLATION" equiv-text="{{email}}"/>. Länken kommer bli ogiltig om en timme.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
+        <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>
@@ -8745,19 +8864,13 @@
         <context-group name="null">
           <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>
+        <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="translated">Alla</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>
+        <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">
         <source>Today</source>
@@ -8765,8 +8878,8 @@
         <context-group name="null">
           <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>
-        <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/+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">
         <source>Last 7 days</source>
@@ -8774,7 +8887,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Last 30 days</source>
@@ -8782,7 +8895,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Last 365 days</source>
@@ -8790,7 +8903,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Short (&lt; 4 min)</source>
@@ -8798,7 +8911,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Medium (4-10 min)</source>
@@ -8806,7 +8919,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Long (> 10 min)</source>
@@ -8814,7 +8927,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Relevance</source>
@@ -8822,7 +8935,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Publish date</source>
@@ -8830,7 +8943,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Views</source>
@@ -8838,127 +8951,128 @@
         <context-group name="null">
           <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>
+        <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="translated">Sökregistret kan inte nås. Försöker igen med resultat från den här instansen istället.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+search/search.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0d2f91ea86a6d3ff1f6c69ae1928f74f483e36bb" datatype="html">
+        <source>Search error</source>
+        <target state="translated">Sökfel</target>
+        <context-group purpose="location">
+          <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">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> years ago</source>
-        <target><x id="INTERPOLATION" equiv-text="{{interval}}"/> år sedan</target>
+        <target>för <x id="INTERPOLATION" equiv-text="{{interval}}"/> år sedan</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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="translated"><x id="INTERPOLATION" equiv-text="{{interval}}"/> år sedan</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>
+        <target state="translated">för <x id="INTERPOLATION" equiv-text="{{interval}}"/> år sedan</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="e622d3813449fe36371ea258281059306819199d">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> months ago</source>
-        <target><x id="INTERPOLATION" equiv-text="{{interval}}"/> månader sedan</target>
+        <target>för <x id="INTERPOLATION" equiv-text="{{interval}}"/> månader sedan</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> month ago</source>
-        <target><x id="INTERPOLATION" equiv-text="{{interval}}"/> månad sedan</target>
+        <target>för <x id="INTERPOLATION" equiv-text="{{interval}}"/> månad sedan</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> weeks ago</source>
-        <target><x id="INTERPOLATION" equiv-text="{{interval}}"/> veckor sedan</target>
+        <target>för <x id="INTERPOLATION" equiv-text="{{interval}}"/> veckor sedan</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> week ago</source>
-        <target><x id="INTERPOLATION" equiv-text="{{interval}}"/> vecka sedan</target>
+        <target>för <x id="INTERPOLATION" equiv-text="{{interval}}"/> vecka sedan</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> days ago</source>
-        <target><x id="INTERPOLATION" equiv-text="{{interval}}"/> dagar sedan</target>
+        <target>för <x id="INTERPOLATION" equiv-text="{{interval}}"/> dagar sedan</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> day ago</source>
-        <target><x id="INTERPOLATION" equiv-text="{{interval}}"/> dag sedan</target>
+        <target>för <x id="INTERPOLATION" equiv-text="{{interval}}"/> dag sedan</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> hours ago</source>
-        <target><x id="INTERPOLATION" equiv-text="{{interval}}"/> timmar sedan</target>
+        <target>för <x id="INTERPOLATION" equiv-text="{{interval}}"/> timmar sedan</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> hour ago</source>
-        <target><x id="INTERPOLATION" equiv-text="{{interval}}"/> timme sedan</target>
+        <target>för <x id="INTERPOLATION" equiv-text="{{interval}}"/> timme sedan</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> min ago</source>
-        <target><x id="INTERPOLATION" equiv-text="{{interval}}"/> min sedan</target>
+        <target>för <x id="INTERPOLATION" equiv-text="{{interval}}"/> minuter sedan</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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="translated">alldeles nyss</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>
+        <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="translated"><x id="INTERPOLATION" equiv-text="{{hours}}"/> tim <x id="INTERPOLATION_1" equiv-text="{{minutes}}"/> min <x id="INTERPOLATION_2" equiv-text="{{seconds}}"/> s</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>
+        <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="translated"><x id="INTERPOLATION" equiv-text="{{minutes}}"/> min <x id="INTERPOLATION_1" equiv-text="{{seconds}}"/> s</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>
+        <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="translated"><x id="INTERPOLATION" equiv-text="{{seconds}}"/> s</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>
+        <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">
         <source>Confirm</source>
@@ -8966,7 +9080,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/confirm/confirm.component.ts</context><context context-type="linenumber">1</context></context-group>
+        <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">
         <source>Instance name is required.</source>
@@ -8974,7 +9088,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Short description should not be longer than 250 characters.</source>
@@ -8982,7 +9096,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Twitter username is required.</source>
@@ -8990,7 +9104,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Previews cache size is required.</source>
@@ -8998,7 +9112,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Previews cache size must be greater than 1.</source>
@@ -9006,7 +9120,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Previews cache size must be a number.</source>
@@ -9014,7 +9128,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Captions cache size is required.</source>
@@ -9022,7 +9136,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Captions cache size must be greater than 1.</source>
@@ -9030,7 +9144,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Captions cache size must be a number.</source>
@@ -9038,7 +9152,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Signup limit is required.</source>
@@ -9046,7 +9160,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Signup limit must be greater than 1.</source>
@@ -9054,7 +9168,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Signup limit must be a number.</source>
@@ -9062,7 +9176,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Admin email is required.</source>
@@ -9070,7 +9184,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Admin email must be valid.</source>
@@ -9078,7 +9192,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Transcoding threads is required.</source>
@@ -9086,7 +9200,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Transcoding threads must be greater or equal to 0.</source>
@@ -9094,23 +9208,23 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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="6975c8c2dac1982f393cb9a890e33ef95b758111">
-        <source>Index URL is required.</source>
-        <target>Index-URL måste anges.</target>
+      <trans-unit id="febc4795f39d34b901907a2718b0c5c21165eb36">
+        <source>Index URL should be a URL</source>
+        <target>Registerlänken måste vara en giltig webbadress</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
-        <source>Index URL should be a URL</source>
-        <target>Index-URL måste vara en URL</target>
-        <context-group name="null">
+      <trans-unit id="db7b7efed1c793079b2bf74cdfba73fed05f63ec" datatype="html">
+        <source>Search index URL should be a URL</source>
+        <target state="translated">Sökregistrets länk måste vara en giltig webbadress</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>
-        <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="b6f52e19f074f77866fa03fabe1ddd5cdae346f0">
         <source>Email is required.</source>
@@ -9118,8 +9232,8 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Email must be valid.</source>
@@ -9127,8 +9241,8 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Your name is required.</source>
@@ -9136,7 +9250,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="1fc4633008a2431fdec891d58efcc8b865d7de1a">
         <source>Your name must be at least 1 character long.</source>
@@ -9144,7 +9258,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="c7b44b92c0ce3ccd2f804d001e13da399524e11b">
         <source>Your name cannot be more than 120 characters long.</source>
@@ -9152,7 +9266,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="73417de6b009e361996f9cd0e3b83d88bed368b6">
         <source>A subject is required.</source>
@@ -9160,7 +9274,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="4f049fd004313524afeaf0ae25f98583a0ffd29b">
         <source>The subject must be at least 1 character long.</source>
@@ -9168,7 +9282,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="d82f880ea1d0ee03c47bf1212a0fbcb23b3edf18">
         <source>The subject cannot be more than 120 characters long.</source>
@@ -9176,7 +9290,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="40b35cf927f9f9a59404a6c914ec4632690b69b2">
         <source>A message is required.</source>
@@ -9184,7 +9298,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="d8d4a23f467ee3e93ca0edb1198c233ed633cf64">
         <source>The message must be at least 3 characters long.</source>
@@ -9192,7 +9306,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="07422f6141cfcabaf3c2ce77e3e063222849ef60">
         <source>The message cannot be more than 5000 characters long.</source>
@@ -9200,7 +9314,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/shared-forms/form-validators/instance-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="5db300f6fba918a35597160183205ede13e8e149">
         <source>Username is required.</source>
@@ -9208,8 +9322,8 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Password is required.</source>
@@ -9217,8 +9331,8 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Confirmation of the password is required.</source>
@@ -9226,7 +9340,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Username must be at least 1 character long.</source>
@@ -9234,7 +9348,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Username cannot be more than 50 characters long.</source>
@@ -9242,7 +9356,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Username should be lowercase alphanumeric; dots and underscores are allowed.</source>
@@ -9250,7 +9364,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Password must be at least 6 characters long.</source>
@@ -9258,7 +9372,8 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Password cannot be more than 255 characters long.</source>
@@ -9266,7 +9381,8 @@
         <context-group name="null">
           <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>
+        <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">
         <source>The new password and the confirmed password do not correspond.</source>
@@ -9274,7 +9390,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Video quota is required.</source>
@@ -9282,7 +9398,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Quota must be greater than -1.</source>
@@ -9290,7 +9406,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Daily upload limit is required.</source>
@@ -9298,7 +9414,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Daily upload limit must be greater than -1.</source>
@@ -9306,7 +9422,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>User role is required.</source>
@@ -9314,7 +9430,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Description must be at least 3 characters long.</source>
@@ -9322,9 +9438,9 @@
         <context-group name="null">
           <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>
-        <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>
+        <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">
         <source>Description cannot be more than 1000 characters long.</source>
@@ -9332,9 +9448,9 @@
         <context-group name="null">
           <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>
-        <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>
+        <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">
         <source>You must agree with the instance terms in order to register on it.</source>
@@ -9342,7 +9458,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Ban reason must be at least 3 characters long.</source>
@@ -9350,7 +9466,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Ban reason cannot be more than 250 characters long.</source>
@@ -9358,7 +9474,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Display name is required.</source>
@@ -9366,9 +9482,9 @@
         <context-group name="null">
           <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>
-        <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>
+        <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">
         <source>Display name must be at least 1 character long.</source>
@@ -9376,9 +9492,9 @@
         <context-group name="null">
           <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>
-        <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>
+        <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">
         <source>Display name cannot be more than 50 characters long.</source>
@@ -9386,8 +9502,8 @@
         <context-group name="null">
           <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>
-        <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/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">
         <source>Report reason is required.</source>
@@ -9395,47 +9511,65 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/abuse-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="993f9f5703d449a1d467243db75253d288a2947e">
         <source>Report reason must be at least 2 characters long.</source>
         <target>Anmälans motivering måste innehålla minst två tecken.</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/abuse-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="8c7d4c82b057aea5dbae811e16935f9bcae4c2aa">
         <source>Report reason cannot be more than 3000 characters long.</source>
         <target>Anmälans motivering får inte vara mer än 3000 tecken lång.</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/abuse-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2fa41debd17a206d4a2a5e8d14bcd7055f6e5118">
         <source>Moderation comment is required.</source>
         <target>Moderationskommentar krävs.</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/abuse-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="82e31d0837eaa69a4364e7434d253ce138b3c5c2">
         <source>Moderation comment must be at least 2 characters long.</source>
         <target>Moderationskommentaren måste innehålla minst två tecken.</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/abuse-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="23c1c2e105a98b0b6728949418a256b026b8971c">
         <source>Moderation comment cannot be more than 3000 characters long.</source>
         <target>Moderationskommentaren får inte vara mer än 3000 tecken lång.</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-forms/form-validators/abuse-validators.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="6cf3fb2942eaba719434ac5bfee14cd12eb4ba06" datatype="html">
+        <source>Abuse message is required.</source><target state="new">Abuse message is required.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-forms/form-validators/abuse-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="794d6533ae6a1befb91defa25e8329fb394400f3" datatype="html">
+        <source>Abuse message must be at least 2 characters long.</source><target state="new">Abuse message must be at least 2 characters long.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-forms/form-validators/abuse-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="47178a11f0442e872149a4c8598b6d4c21956c3e" datatype="html">
+        <source>Abuse message cannot be more than 3000 characters long.</source><target state="new">Abuse message cannot be more than 3000 characters long.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-forms/form-validators/abuse-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="94b831c7e3684258f88e099c6cd3b8f73f8a2de6">
         <source>The channel is required.</source>
@@ -9443,23 +9577,23 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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="0776b05d442a0a16f083a5eefa52a166b9d514ca">
-        <source>Blacklist reason must be at least 2 characters long.</source>
-        <target>Anledningen för svartlistning måste innehålla minst två tecken.</target>
-        <context-group name="null">
+      <trans-unit id="b19eeb7380a6bbb6dd791afdb262107749d8b990" datatype="html">
+        <source>Block reason must be at least 2 characters long.</source>
+        <target state="translated">Blockeringsorsaken måste innehålla minst två tecken.</target>
+        <context-group purpose="location">
+          <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>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/forms/form-validators/video-blacklist-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
-      <trans-unit id="5009443905b0b152915247799492bf5e164e7626">
-        <source>Blacklist reason cannot be more than 300 characters long.</source>
-        <target>Anledningen för svartlistning får inte vara mer än 300 tecken lång.</target>
-        <context-group name="null">
+      <trans-unit id="5ac23ab9399b1bf51cd2c71b033a3beec5b6d9f7" datatype="html">
+        <source>Block reason cannot be more than 300 characters long.</source>
+        <target state="translated">Blockeringsorsaken får inte vara mer än 300 tecken lång.</target>
+        <context-group purpose="location">
+          <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>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/forms/form-validators/video-blacklist-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="c9eadf8830b3bc09bd444d739af86414eed9bd9e">
         <source>Video caption language is required.</source>
@@ -9467,7 +9601,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Video caption file is required.</source>
@@ -9475,7 +9609,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>The username is required.</source>
@@ -9483,7 +9617,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>You can only transfer ownership to a local account</source>
@@ -9491,7 +9625,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Name is required.</source>
@@ -9499,7 +9633,7 @@
         <context-group name="null">
           <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/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="b8b59b6284a14fc71268cf722ed98c62c5af4a76">
         <source>Name must be at least 1 character long.</source>
@@ -9507,7 +9641,7 @@
         <context-group name="null">
           <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/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="e14cd37d29f13eac7384c339e4f1df58d96e4e3d">
         <source>Name cannot be more than 50 characters long.</source>
@@ -9515,7 +9649,7 @@
         <context-group name="null">
           <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/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="135185da003b14cbb69521f570fa617a00bbbe18">
         <source>Name should be lowercase alphanumeric; dots and underscores are allowed.</source>
@@ -9523,7 +9657,7 @@
         <context-group name="null">
           <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/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="e7182e21e9566cc81c83f92727461322f71fd69b">
         <source>Support text must be at least 3 characters long.</source>
@@ -9531,7 +9665,7 @@
         <context-group name="null">
           <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/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="15ec53d9ee65cb930c5f5d10ae2e8dd3fd44fc85">
         <source>Support text cannot be more than 1000 characters long.</source>
@@ -9539,7 +9673,7 @@
         <context-group name="null">
           <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/shared-forms/form-validators/video-channel-validators.service.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="6ca60e0f6dfbc0073b0514bce7d273150b0b9e79">
         <source>Comment is required.</source>
@@ -9547,7 +9681,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Comment must be at least 2 characters long.</source>
@@ -9555,7 +9689,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Comment cannot be more than 3000 characters long.</source>
@@ -9563,7 +9697,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Display name cannot be more than 120 characters long.</source>
@@ -9571,7 +9705,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Privacy is required.</source>
@@ -9579,7 +9713,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>The channel is required when the playlist is public.</source>
@@ -9587,7 +9721,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Video name is required.</source>
@@ -9595,7 +9729,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Video name must be at least 3 characters long.</source>
@@ -9603,7 +9737,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Video name cannot be more than 120 characters long.</source>
@@ -9611,7 +9745,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Video privacy is required.</source>
@@ -9619,7 +9753,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Video channel is required.</source>
@@ -9627,7 +9761,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Video description must be at least 3 characters long.</source>
@@ -9635,7 +9769,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Video description cannot be more than 10000 characters long.</source>
@@ -9643,7 +9777,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>A tag should be more than 2 characters long.</source>
@@ -9651,7 +9785,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>A tag should be less than 30 characters long.</source>
@@ -9659,7 +9793,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Video support must be at least 3 characters long.</source>
@@ -9667,7 +9801,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Video support cannot be more than 1000 characters long.</source>
@@ -9675,7 +9809,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>A date is required to schedule video update.</source>
@@ -9683,7 +9817,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>This file is too large.</source>
@@ -9691,7 +9825,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>PeerTube cannot handle this kind of file. Accepted extensions are <x id="INTERPOLATION" equiv-text="{{extensions}}"/>.</source>
@@ -9699,7 +9833,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>All unsaved data will be lost, are you sure you want to leave this page?</source>
@@ -9707,7 +9841,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Sunday</source>
@@ -9715,7 +9849,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Monday</source>
@@ -9723,7 +9857,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Tuesday</source>
@@ -9731,7 +9865,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Wednesday</source>
@@ -9739,7 +9873,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Thursday</source>
@@ -9747,7 +9881,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Friday</source>
@@ -9755,7 +9889,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Saturday</source>
@@ -9763,7 +9897,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Sun</source>
@@ -9771,8 +9905,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name short</note>
+        <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">
         <source>Mon</source>
@@ -9780,8 +9914,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name short</note>
+        <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">
         <source>Tue</source>
@@ -9789,8 +9923,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name short</note>
+        <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">
         <source>Wed</source>
@@ -9798,8 +9932,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name short</note>
+        <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">
         <source>Thu</source>
@@ -9807,8 +9941,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name short</note>
+        <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">
         <source>Fri</source>
@@ -9816,8 +9950,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name short</note>
+        <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">
         <source>Sat</source>
@@ -9825,8 +9959,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name short</note>
+        <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">
         <source>Su</source>
@@ -9834,8 +9968,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name min</note>
+        <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">
         <source>Mo</source>
@@ -9843,8 +9977,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name min</note>
+        <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">
         <source>Tu</source>
@@ -9852,8 +9986,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name min</note>
+        <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">
         <source>We</source>
@@ -9861,8 +9995,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name min</note>
+        <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">
         <source>Th</source>
@@ -9870,8 +10004,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name min</note>
+        <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">
         <source>Fr</source>
@@ -9879,8 +10013,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name min</note>
+        <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">
         <source>Sa</source>
@@ -9888,8 +10022,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Day name min</note>
+        <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">
         <source>January</source>
@@ -9897,7 +10031,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>February</source>
@@ -9905,7 +10039,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>March</source>
@@ -9913,7 +10047,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>April</source>
@@ -9921,7 +10055,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>May</source>
@@ -9929,8 +10063,8 @@
         <context-group name="null">
           <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>
-        <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/+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">
         <source>June</source>
@@ -9938,7 +10072,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>July</source>
@@ -9946,7 +10080,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>August</source>
@@ -9954,7 +10088,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>September</source>
@@ -9962,7 +10096,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>October</source>
@@ -9970,7 +10104,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>November</source>
@@ -9978,7 +10112,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>December</source>
@@ -9986,7 +10120,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Jan</source>
@@ -9994,8 +10128,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Month name short</note>
+        <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">
         <source>Feb</source>
@@ -10003,8 +10137,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Month name short</note>
+        <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">
         <source>Mar</source>
@@ -10012,8 +10146,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Month name short</note>
+        <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">
         <source>Apr</source>
@@ -10021,8 +10155,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Month name short</note>
+        <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">
         <source>Jun</source>
@@ -10030,8 +10164,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Month name short</note>
+        <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">
         <source>Jul</source>
@@ -10039,8 +10173,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Month name short</note>
+        <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">
         <source>Aug</source>
@@ -10048,8 +10182,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Month name short</note>
+        <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">
         <source>Sep</source>
@@ -10057,8 +10191,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Month name short</note>
+        <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">
         <source>Oct</source>
@@ -10066,8 +10200,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Month name short</note>
+        <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">
         <source>Nov</source>
@@ -10075,8 +10209,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Month name short</note>
+        <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">
         <source>Dec</source>
@@ -10084,8 +10218,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Month name short</note>
+        <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">
         <source>Clear</source>
@@ -10093,7 +10227,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>yy-mm-dd</source>
@@ -10101,8 +10235,8 @@
         <context-group name="null">
           <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>
         <note from="description" priority="1">Date format in this locale.</note>
+        <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">
         <source>Hidden</source>
@@ -10110,7 +10244,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Blurred with confirmation request</source>
@@ -10118,7 +10252,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Displayed</source>
@@ -10126,7 +10260,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>~ <x id="INTERPOLATION" equiv-text="{{minutes}}"/> <x id="ICU" equiv-text="{minutes, plural, =1 {...} other {...}}"/></source>
@@ -10134,7 +10268,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>{VAR_PLURAL, plural, =1 {minute} other {minutes} }</source>
@@ -10142,7 +10276,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of full HD videos</source>
@@ -10150,7 +10284,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of HD videos</source>
@@ -10158,7 +10292,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of average quality videos</source>
@@ -10166,7 +10300,27 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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="translated"><x id="INTERPOLATION" equiv-text="{{name}}"/> (kanalsida)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-main/account/avatar.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-miniature.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2ae54a1b18fc8315f431aecc74f58fb12f066231" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{name}}"/> (account page)</source>
+        <target state="translated"><x id="INTERPOLATION" equiv-text="{{name}}"/> (kontosida)</target>
+        <context-group purpose="location">
+          <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">
         <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>
@@ -10174,7 +10328,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/misc/help.component.ts</context><context context-type="linenumber">1</context></context-group>
+        <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">
         <source>Emphasis</source>
@@ -10182,7 +10336,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/misc/help.component.ts</context><context context-type="linenumber">1</context></context-group>
+        <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">
         <source>Links</source>
@@ -10190,7 +10344,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/misc/help.component.ts</context><context context-type="linenumber">1</context></context-group>
+        <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">
         <source>New lines</source>
@@ -10198,7 +10352,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/misc/help.component.ts</context><context context-type="linenumber">1</context></context-group>
+        <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">
         <source>Lists</source>
@@ -10206,7 +10360,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/misc/help.component.ts</context><context context-type="linenumber">1</context></context-group>
+        <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">
         <source>Images</source>
@@ -10214,7 +10368,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/misc/help.component.ts</context><context context-type="linenumber">1</context></context-group>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{num}}"/> users banned.</source>
@@ -10222,7 +10376,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>User <x id="INTERPOLATION" equiv-text="{{username}}"/> banned.</source>
@@ -10230,7 +10384,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Do you really want to unban <x id="INTERPOLATION" equiv-text="{{username}}"/>?</source>
@@ -10238,7 +10392,7 @@
         <context-group name="null">
           <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/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="925ba9946b7b256a586f0fcbe3e04fa7a0dee7bd">
         <source>User <x id="INTERPOLATION" equiv-text="{{username}}"/> unbanned.</source>
@@ -10246,7 +10400,7 @@
         <context-group name="null">
           <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/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="ad07d34d4aadfe03c964cec02ca1d3a921e6b603">
         <source>If you remove this user, you will not be able to create another with the same username!</source>
@@ -10254,7 +10408,7 @@
         <context-group name="null">
           <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/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="28220fae6799ab98ef6b41af449aa9680082357a">
         <source>User <x id="INTERPOLATION" equiv-text="{{username}}"/> deleted.</source>
@@ -10262,7 +10416,7 @@
         <context-group name="null">
           <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/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="534202c90c6dcadd2989fc72c5030d5483e26096">
         <source>User <x id="INTERPOLATION" equiv-text="{{username}}"/> email set as verified</source>
@@ -10270,7 +10424,7 @@
         <context-group name="null">
           <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/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="33a6319f765848a22a155cef9f1d8e645202e249">
         <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> muted.</source>
@@ -10278,7 +10432,8 @@
         <context-group name="null">
           <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/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/shared-video-miniature/video-actions-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="086eda792aeb1b0d131d633b50fdd1792f5f24c6">
         <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> muted.</source>
@@ -10286,7 +10441,7 @@
         <context-group name="null">
           <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/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="bb72d6d1219e89d182e9fd09d853d83baf8d6499">
         <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> muted by the instance.</source>
@@ -10294,22 +10449,28 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/shared/shared-abuse-list/abuse-list-table.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="translated">Ignorera server</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-abuse-list/abuse-list-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="ecc473396f70a6ba41411c9449320f9e8d4cfbcf" datatype="html">
         <source>Server <x id="INTERPOLATION" equiv-text="{{host}}"/> muted by the instance.</source>
         <target state="translated">Servern <x id="INTERPOLATION" equiv-text="{{host}}"/> ignoreras av instansen.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="2cf214838d3a640ba70a9e44070f2d8169f39051" datatype="html">
+        <source>Add a message to communicate with the reporter</source><target state="new">Add a message to communicate with the reporter</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-message-modal.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit><trans-unit id="0473c4301ebd69bdc01833665a2a2359c2dfb380" datatype="html">
+        <source>Add a message to communicate with the moderation team</source><target state="new">Add a message to communicate with the moderation team</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/shared/shared-abuse-list/abuse-message-modal.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -10319,7 +10480,7 @@
         <context-group name="null">
           <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/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="35d3509161861a610b0895bf084c781e56ba2830">
         <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> muted by the instance.</source>
@@ -10327,7 +10488,7 @@
         <context-group name="null">
           <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/shared-moderation/user-moderation-dropdown.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="978aeec5613fa97e8a5336d3599cebb23ee5a90f">
         <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted by the instance.</source>
@@ -10335,65 +10496,47 @@
         <context-group name="null">
           <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><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">
-        <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">
-        <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>
+        <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="translated">Är du säker på att du vill ta bort alla kommentarer författade av det här kontot?</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="52f803962375daf7fc526ec0ee14a050c3d534c1" datatype="html">
+        <source>Delete account comments</source>
+        <target state="translated">Radera kommentarer från kontot</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="2100e5e8263ed1516f0160f2fe2acecc6f571fdd" datatype="html">
+        <source>Will remove comments of this account (may take several minutes).</source>
+        <target state="translated">Ta bort alla kommentarer som författats av det här kontot (kan ta flera minuter).</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="632e8b20c98e8eec4059a605a4b011bb476137af" datatype="html">
         <source>Edit user</source>
         <target state="translated">Redigera användare</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>
+        <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="translated">Ändra videokvot, behörigheter och mer.</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>
+        <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="translated">Radera användare</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>
+        <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="translated">Upphäv blockering av användare</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>
+        <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="translated">Låt användaren logga in och skapa videor eller kommentarer igen</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>
+        <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">
         <source>Mute this account</source>
@@ -10401,15 +10544,12 @@
         <context-group name="null">
           <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/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="translated">Dölj allt innehåll från den användaren för dig.</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>
+        <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">
         <source>Unmute this account</source>
@@ -10417,15 +10557,12 @@
         <context-group name="null">
           <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/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="translated">Visa innehåll från den användaren för dig igen.</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>
+        <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">
         <source>Mute the instance</source>
@@ -10433,15 +10570,12 @@
         <context-group name="null">
           <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/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="translated">Dölj allt innehåll från den instansen för dig.</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>
+        <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">
         <source>Unmute the instance</source>
@@ -10449,27 +10583,22 @@
         <context-group name="null">
           <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/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="translated">Visa innehåll från den instansen för dig igen.</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="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/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/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/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="translated">Ta bort kommentarer från dina videor</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="translated">Ta bort kommentarer på dina videor från det här kontot.</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">
         <source>Mute this account by your instance</source>
@@ -10477,15 +10606,12 @@
         <context-group name="null">
           <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/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="translated">Dölj allt innehåll från den användaren för dig, din instans och dess användare.</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>
+        <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">
         <source>Unmute this account by your instance</source>
@@ -10493,15 +10619,12 @@
         <context-group name="null">
           <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/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="translated">Visa allt innehåll från den användaren för dig, din instans och dess användare igen.</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>
+        <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">
         <source>Mute the instance by your instance</source>
@@ -10509,15 +10632,12 @@
         <context-group name="null">
           <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/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="translated">Dölj allt innehåll från den instansen för dig, din instans och dess användare.</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>
+        <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">
         <source>Unmute the instance by your instance</source>
@@ -10525,35 +10645,98 @@
         <context-group name="null">
           <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/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="translated">Visa allt innehåll från den användaren för dig, din instans och dess användare igen.</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="translated">Ta bort kommentarer från din instans</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="translated">Ta bort kommentarer författade av det här kontot från din instans.</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="translated">Våldsamt eller motbjudande</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="4c78954b2e1a4c2a457fd10f87ac398a86db88f3" datatype="html">
+        <source>Contains offensive, violent, or coarse language or iconography.</source>
+        <target state="translated">Innehåller språk eller bildspråk som upplevs stötande, våldsamt eller grovt.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="da98842df682acde758f4b18f4d67c43c8f2885b" datatype="html">
+        <source>Hateful or abusive</source>
+        <target state="translated">Hatiskt eller nedsättande</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="338b2cbcea511d70613c96bbe942b9e2c4714cf1" datatype="html">
+        <source>Contains abusive, racist or sexist language or iconography.</source>
+        <target state="translated">Innehåller språk eller bildspråk som upplevs nedsättande, rasistiskt eller sexistiskt.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="d540707e326c991a0b2eb05fe78ae5431c7b5f61" datatype="html">
+        <source>Spam, ad or false news</source>
+        <target state="translated">Spam, reklam eller vilseledande information</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></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="translated">Innehåller reklam, spam, medvetet vilseledande information eller på annat sätt missvisande miniatyrbild, text eller taggar. Uppge gärna trovärdiga källor för att anmäla bluffar.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="697e6f711173360c87a384af631fc8f13cd3d827" datatype="html">
+        <source>Privacy breach or doxxing</source>
+        <target state="translated">Publicering av personuppgifter eller personliga dokument</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></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="translated">Innehåller personuppgifter som skulle kunna användas för att spåra, identifiera, kontakta eller stjäla någons identitet (t.ex. namn, adress, telefonnummer, e-postadress eller bankuppgifter).</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="d4e2e051a0f3160dfb6cf753ef8625ca6c0a2660" datatype="html">
+        <source>Infringes your copyright wrt. the regional laws with which the server must comply.</source><target state="new">Infringes your copyright wrt. the regional laws 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="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/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/moderation/user-moderation-dropdown.component.ts</context>
+          <context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      
+      
+      <trans-unit id="3732f37956e36cea2271d2333b8b04a6ad417274" datatype="html">
+        <source>Breaks server rules</source>
+        <target state="translated">Brott mot serverregler</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></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="translated">Någonting som inte nämns ovan och innebär ett brott mot användaravtalet, uppförandekoden eller de allmänna serverreglerna.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="027a3589ca1b92b000b183e249d9d7bea1dce727" datatype="html">
+        <source>The above can only be seen in thumbnails.</source>
+        <target state="translated">Ovanstående kan endast ses i miniatyrbilden.</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
+      <trans-unit id="148c963c0ecee2b9e6c8ce11e70ae62e36efaa36" datatype="html">
+        <source>The above can only be seen in captions (please describe which).</source>
+        <target state="translated">Ovanstående förekommer endast i textningen (ange vilken).</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-moderation/abuse.service.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="0c0f5bbcd2386018ec057877f9d3c5c2c9880cac">
         <source>Request is too large for the server. Please contact you administrator if you want to increase the limit size.</source>
         <target>Förfrågan är för stor för servern. Kontakta gärna din administratör om du vill öka storleksbegränsningen.</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Too many attempts, please try again after <x id="INTERPOLATION" equiv-text="{{minutesLeft}}"/> minutes.</source>
@@ -10561,7 +10744,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Too many attempts, please try again later.</source>
@@ -10569,7 +10752,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Server error. Please retry later.</source>
@@ -10577,23 +10760,17 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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="translated">Prenumererar på samtliga kanaler tillhörande <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/>. Du kommer underrättas om alla nya videor.</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>
+        <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="translated">Prenumererar på <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/>. Du kommer underrättas om alla nya videor.</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>
+        <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">
         <source>Subscribed</source>
@@ -10601,15 +10778,12 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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="translated">Prenumerationerna på <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> har avslutats</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>
+        <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">
         <source>Unsubscribed from <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/></source>
@@ -10617,7 +10791,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Unsubscribed</source>
@@ -10625,7 +10799,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Moderator</source>
@@ -10633,7 +10807,7 @@
         <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.service.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="5034e84fab7cd3d662d2483753e33caea0774b78">
         <source>Video removed from <x id="INTERPOLATION" equiv-text="{{name}}"/></source>
@@ -10641,8 +10815,8 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Video added in <x id="INTERPOLATION" equiv-text="{{n}}"/> at timestamps <x id="INTERPOLATION_1" equiv-text="{{t}}"/></source>
@@ -10650,7 +10824,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/shared-video-playlist/video-add-to-playlist.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="f69a06eee4963406efdbff8c3d9765832c30482f">
         <source>Video added in <x id="INTERPOLATION" equiv-text="{{n}}"/></source>
@@ -10658,7 +10832,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/shared-video-playlist/video-add-to-playlist.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="986f17319b16d01d0047e2e2cd728bf4dbac4fe8">
         <source>Timestamps updated</source>
@@ -10666,7 +10840,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Starts at</source>
@@ -10674,8 +10848,8 @@
         <context-group name="null">
           <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>
-        <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/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">
         <source>Stops at</source>
@@ -10683,7 +10857,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>and stops at</source>
@@ -10691,84 +10865,62 @@
         <context-group name="null">
           <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>
+        <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="73c33d602da89a33d353d686f36c2fff39f0aee3">
-        <source>Video blacklisted.</source>
-        <target>Videon är svartlistad.</target>
-        <context-group name="null">
+      <trans-unit id="19e5e5956502d977d5dd28fe86cee763d5db2b77" datatype="html">
+        <source>Delete video</source>
+        <target state="translated">Radera video</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit><trans-unit id="9401bf6762245b076fbb9ac13ba99fcb5a2a685f" datatype="html">
+        <source>Actions for the comment</source><target state="new">Actions for the comment</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-        <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="translated">Ta bort video från svartlista</target>
+      </trans-unit><trans-unit id="0e83d1697fa9a43ea0ff6f767711f44d0f4de982" datatype="html">
+        <source>Delete comment</source><target state="new">Delete comment</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/shared/shared-abuse-list/abuse-list-table.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="translated">Video borttagen från svartlista.</target>
+      </trans-unit><trans-unit id="b941904ef1529f780df0c85a97843b6dcb132cab" datatype="html">
+        <source>Do you really want to delete this comment?</source><target state="new">Do you really want to delete this comment?</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/shared/shared-abuse-list/abuse-list-table.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="translated">Radera video</target>
+      </trans-unit><trans-unit id="7f37a4b962982d3e0e1ce1711999d24592d0db36" datatype="html">
+        <source>Comment deleted.</source><target state="new">Comment 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="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5f316500cde1925ffcdf053a7427b44795161f4e" datatype="html">
         <source>Encoder</source>
         <target state="translated">Kodek</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/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="translated">Formatnamn</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/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="translated">Storlek</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/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="translated">Bithastighet</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>
+        <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="translated">Kodek</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/shared-video-miniature/video-download.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="ef90545bc832876c0d7f9a10363c75137472bbb5">
         <source>Copied</source>
@@ -10776,8 +10928,8 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Video reported.</source>
@@ -10785,46 +10937,44 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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/report-modals/video-report.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="f1abd89c9280323209e939fa9c30f6e5cda20c95">
         <source>Do you really want to delete this video?</source>
         <target>Vill du verkligen radera den här videon?</target>
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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-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-abuse-list/abuse-list-table.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="translated">Video raderad.</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-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-abuse-list/abuse-list-table.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="translated">Åtgärder för anmälaren</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-abuse-list/abuse-list-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="2c33a2bd1e9f50f870366f281ff903cedf9b6a53" datatype="html">
         <source>Mute reporter</source>
         <target state="translated">Ignorera anmälare</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-abuse-list/abuse-list-table.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="c3ca1344a9cd638109e09c125e5185c1da3ca39c" datatype="html">
         <source>This video will be duplicated by your instance.</source>
         <target state="translated">Den här videon kommer dupliceras av din instans.</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="translated">Blockera</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>
@@ -10834,22 +10984,22 @@
         <context-group name="null">
           <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>
-        <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">
-        <source>Blacklist</source>
-        <target>Svartlista</target>
-        <context-group name="null">
-          <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>
+        <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="translated">Spegla</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="3797009a642d28abfc76cd0aec0c2ec899686807" datatype="html">
+        <source>Mute account</source>
+        <target state="translated">Ignorera konto</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-list-table.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="c9c0e03855f8354fcf5399813c93e12bde1cc8ec" datatype="html">
+        <source>Mute server account</source><target state="new">Mute server account</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-abuse-list/abuse-list-table.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -10859,30 +11009,55 @@
         <context-group name="null">
           <context context-type="linenumber">1</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">54</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-details.component.html</context><context context-type="linenumber">65</context></context-group></trans-unit>
+      <trans-unit id="08a52c67462389568cf14a021ddecc0aedaa9613" datatype="html">
+        <source>Reported part</source>
+        <target state="translated">Anmält avsnitt</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-details.component.html</context><context context-type="linenumber">83</context></context-group></trans-unit>
       <trans-unit id="5c54befce78d70e20c215f10a00e617245f53bc9" datatype="html">
         <source>Note</source>
-        <target state="translated">Notera</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-group>
-      </trans-unit>
+        <target state="translated">Kommentar</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-details.component.html</context><context context-type="linenumber">90</context></context-group></trans-unit>
       <trans-unit id="1d3402b0e60154aaa071f390c63437b701d9048c" datatype="html">
         <source>The video was deleted</source>
         <target state="translated">Videon har raderats</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-details.component.html</context><context context-type="linenumber">99</context></context-group></trans-unit><trans-unit id="96e41129ef5d2fa12b7a6ffcab608e9af04d8cbd" datatype="html">
+        <source>Comment:</source><target state="new">Comment:</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 context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-details.component.html</context>
+          <context context-type="linenumber">105</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="076960cf44b4a0e89cc5024a75963844b068b284" datatype="html">
-        <source>The video was blacklisted</source>
-        <target state="translated">Videon har svartlistats</target>
+      </trans-unit><trans-unit id="91e073459fc31b0fc1f6384aa9ad816f9f796de8" datatype="html">
+        <source>Messages with the reporter</source><target state="new">Messages with the reporter</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 context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-message-modal.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit><trans-unit id="f0327abdde923ab7f56cf036a5bf6bc2546126c0" datatype="html">
+        <source>Messages with the moderation team</source><target state="new">Messages with the moderation team</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-message-modal.component.html</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit><trans-unit id="158f56a96d95d4ddcfe506aca64f754d01fa11b6" datatype="html">
+        <source>
+      No messages for now.
+    </source><target state="new">
+      No messages for now.
+    </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-message-modal.component.html</context>
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit><trans-unit id="7d1344e3d4e8b1b30abaaf383945b4543d70b303" datatype="html">
+        <source>Add a message</source><target state="new">Add a message</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-abuse-list/abuse-message-modal.component.html</context>
+          <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit>
       <trans-unit id="dd9f3264feed4935008861c15d81c947124e4ac3">
@@ -10891,7 +11066,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Publication scheduled on</source>
@@ -10899,7 +11074,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Waiting transcoding</source>
@@ -10907,7 +11082,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>To transcode</source>
@@ -10915,7 +11090,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>To import</source>
@@ -10923,23 +11098,17 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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="translated">Lägg till i Titta senare</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>
+        <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="translated">Ta bort från Titta senare</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>
+        <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">
         <source>Only I can see this video</source>
@@ -10947,7 +11116,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video.service.ts</context><context context-type="linenumber">1</context></context-group>
+        <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">
         <source>Only people with the private link can see this video</source>
@@ -10955,7 +11124,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video.service.ts</context><context context-type="linenumber">1</context></context-group>
+        <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">
         <source>Anyone can see this video</source>
@@ -10963,15 +11132,12 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video.service.ts</context><context context-type="linenumber">1</context></context-group>
+        <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="translated">Den här videon kan endast ses av användare på den här instansen</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>
+        <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">
         <source>Video to import updated.</source>
@@ -10979,8 +11145,8 @@
         <context-group name="null">
           <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-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>
+        <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">
         <source>Your video was uploaded to your account and is private.</source>
@@ -10988,7 +11154,7 @@
         <context-group name="null">
           <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-upload.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-upload.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="24840228f2826b66252cfcaab9820b1c7e0da264">
         <source>But associated data (tags, description...) will be lost, are you sure you want to leave this page?</source>
@@ -10996,7 +11162,7 @@
         <context-group name="null">
           <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-upload.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-upload.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="5af84926d631326e548573ebf0f6dff07845aeb4">
         <source>Your video is not uploaded yet, are you sure you want to leave this page?</source>
@@ -11004,7 +11170,7 @@
         <context-group name="null">
           <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-upload.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-upload.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="bef4ec92fa80e7b7ac03f8ad2b49d2a126f0cc71">
         <source>Upload <x id="INTERPOLATION" equiv-text="{{videofileName}}"/></source>
@@ -11012,7 +11178,7 @@
         <context-group name="null">
           <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-upload.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-upload.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="c5cb19aeb6447deda40cc1227ceca1359ab955e9">
         <source>Upload cancelled</source>
@@ -11020,7 +11186,7 @@
         <context-group name="null">
           <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-upload.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-upload.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="972fc644f847cf84e4732ec012915c4cdaf865ce">
         <source>Video published.</source>
@@ -11028,7 +11194,7 @@
         <context-group name="null">
           <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-upload.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-upload.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="a6019e856f511dbe1fe658790c71c594b26930ee">
         <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>
@@ -11036,7 +11202,7 @@
         <context-group name="null">
           <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-upload.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-upload.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="c980896ac8e08e9751545db1b7ef0e93fb8a52cd">
         <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>
@@ -11044,7 +11210,7 @@
         <context-group name="null">
           <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-upload.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-upload.component.ts</context><context context-type="linenumber">1</context></context-group>
       </trans-unit>
       <trans-unit id="bfdf9de4bd9140f77feb6a5fe2b51f3f0565eaa4">
         <source>You have unsaved changes! If you leave, your changes will be lost.</source>
@@ -11052,7 +11218,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Video updated.</source>
@@ -11060,15 +11226,22 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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="def9f4afb698109cf2e9a0ad59f0b5c02a796d52" datatype="html">
+        <source>Report comment</source><target state="new">Report comment</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+videos/+video-watch/comment/video-comment.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-moderation/report-modals/comment-report.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="translated">Raderingen kommer skickas till fjärrinstansen så att den kan spegla ändringarna.</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>
+        <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">
         <source>It is a remote comment, so the deletion will only be effective on your instance.</source>
@@ -11076,47 +11249,32 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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="translated">Spela inte nästa video automatiskt</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>
+        <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="translated">Spela nästa video automatiskt</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>
+        <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="translated">Sluta loopa videor i spellistor</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>
+        <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="translated">Loopa videor i spellistor</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>
+        <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="translated">Du måste vara inloggad för att betygsätta den här videon.</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>
+        <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">
         <source><x id="INTERPOLATION" equiv-text="{{likesNumber}}"/> likes / <x id="INTERPOLATION_1" equiv-text="{{dislikesNumber}}"/> dislikes</source>
@@ -11124,7 +11282,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>This video contains mature or explicit content. Are you sure you want to watch it?</source>
@@ -11132,7 +11290,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Mature or explicit content</source>
@@ -11140,111 +11298,72 @@
         <context-group name="null">
           <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>
+        <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="translated">Kommer härnäst</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>
+        <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="translated">Automatisk uppspelning är upphävd</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>
+        <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="translated">Slå av eller på helskärmsläget (spelaren måste vara markerad)</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>
+        <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="translated">Spela eller pausa videon (spelaren måste vara markerad)</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>
+        <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="translated">Slå av eller på ljudet (spelaren måste vara markerad)</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>
+        <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="translated">Hoppa till en position i videon: 0 motsvarar 0 % av den totala speltiden och 9 motsvarar 90 % (spelaren måste vara markerad)</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>
+        <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="translated">Öka volymen (spelaren måste vara markerad)</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>
+        <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="translated">Minska volymen (spelaren måste vara markerad)</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>
+        <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="translated">Spola videon framåt (spelaren måste vara markerad)</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>
+        <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="translated">Spola videon bakåt (spelaren måste vara markerad)</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>
+        <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="translated">Öka uppspelningshastigheten (spelaren måste vara markerad)</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>
+        <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="translated">Minska uppspelningshastigheten (spelaren måste vara markerad)</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>
+        <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="translated">Föregående eller nästkommande bildruta (spelaren måste vara markerad)</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>
+        <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">
         <source>Like the video</source>
@@ -11252,7 +11371,7 @@
         <context-group name="null">
           <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>
+        <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">
         <source>Dislike the video</source>
@@ -11260,15 +11379,12 @@
         <context-group name="null">
           <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>
+        <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="translated">Nästa video kommer börja automatiskt om den här funktionen är aktiverad.</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>
+        <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">
         <source>Videos that have the higher number of likes.</source>
@@ -11276,7 +11392,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Trending for the last 24 hours</source>
@@ -11284,7 +11400,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Trending videos are those totalizing the greatest number of views during the last 24 hours</source>
@@ -11292,7 +11408,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Trending for the last <x id="INTERPOLATION" equiv-text="{{days}}"/> days</source>
@@ -11300,7 +11416,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Trending videos are those totalizing the greatest number of views during the last <x id="INTERPOLATION" equiv-text="{{days}}"/> days</source>
@@ -11308,7 +11424,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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">
         <source>Videos from your subscriptions</source>
@@ -11316,7 +11432,7 @@
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <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>
+        <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>