1 files changed, 383 insertions, 403 deletions

diff --git a/client/src/locale/angular.fi-FI.xlf b/client/src/locale/angular.fi-FI.xlf
index 8d741560f..cae5cf85a 100644
--- a/client/src/locale/angular.fi-FI.xlf
+++ b/client/src/locale/angular.fi-FI.xlf
@@ -437,7 +437,7 @@
           <context context-type="linenumber">9</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">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">41</context></context-group></trans-unit>
+      <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">42</context></context-group></trans-unit>
       <trans-unit id="85e5d1de15d23cde43c530e3740a2a61aed24c2d">
         <source>Start at</source>
         <target>Aloita kohdasta</target>
@@ -629,15 +629,14 @@
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video-miniature.component.html</context><context context-type="linenumber">16</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">33</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch-playlist.component.html</context><context context-type="linenumber">7</context></context-group></trans-unit>
-      <trans-unit id="6aec8cb024acc333218d72f279caa8ea623bb628">
-        <source><x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> views</source>
-        <target><x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> näyttökertaa</target>
-        <context-group name="null">
-          <context context-type="linenumber">24</context>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video-miniature.component.html</context><context context-type="linenumber">16</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">33</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch-playlist.component.html</context><context context-type="linenumber">7</context></context-group></trans-unit><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="new">{VAR_PLURAL, plural, =1 {1 view} other {<x id="INTERPOLATION" equiv-text="{{ video.views | myNumberFormatter }}"/> views} }</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/video/video-miniature.component.html</context>
+          <context context-type="linenumber">27</context>
         </context-group>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video/video-miniature.component.html</context><context context-type="linenumber">27</context></context-group></trans-unit>
+      </trans-unit>
+      
       <trans-unit id="4a806761798181e907e28ed1af053d466526800d">
         <source>Blacklisted</source>
         <target>Estetty</target>
@@ -692,7 +691,7 @@
       <trans-unit id="28df1b02fd88d2deb0212bc5d7ff34cf9492fa54" datatype="html">
         <source>Deleted</source><target state="new">Deleted</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/video-playlist/video-playlist-element-miniature.component.html</context><context context-type="linenumber">34</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">48</context></context-group></trans-unit>
+      <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">49</context></context-group></trans-unit>
       <trans-unit id="2edccfda908b57c073dc0811eaa58818de2be2dc">
         <source>Edit starts/stops at</source>
         <target>Muokkaus alkaa/loppuu kohdassa</target>
@@ -746,7 +745,7 @@
         
         
         
-      <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">182</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">38</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">17</context></context-group></trans-unit>
+      <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">182</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">39</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>
       <trans-unit id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
         <source>Edit</source>
         <target>Muokkaa</target>
@@ -784,78 +783,56 @@
         </context-group>
         <context-group purpose="location"><context context-type="sourcefile">src/app/shared/misc/help.component.html</context><context context-type="linenumber">29</context></context-group>
       </trans-unit>
-      <trans-unit id="5c76e3ae0f85719fb16644ea75bced0229069b97" datatype="html">
-        <source>Subscribe</source><target state="new">Subscribe</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context>
-          <context context-type="linenumber">6</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="c374edf3b9228d3df6d761bdc8a289e7df0096e8">
-        <source>Unsubscribe</source>
-        <target>
-    Lopeta tilaus
-  </target>
-        <context-group name="null">
-          <context context-type="linenumber">18</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">18</context></context-group>
-      </trans-unit>
-      <trans-unit id="2f3f48994ece05cebb717c75ee0c39e871e3df91" datatype="html">
-        <source>Subscribe</source><target state="new">Subscribe</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context>
-          <context context-type="linenumber">26</context>
-        </context-group>
-      </trans-unit>
+      
+      
+      
       <trans-unit id="9b3287f52c239cad05ec98391553e5052ba1aa66">
         <source>Using an ActivityPub account</source>
         <target>Käyttää ActivityPub-tiliä</target>
         <context-group name="null">
           <context context-type="linenumber">36</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">36</context></context-group>
-      </trans-unit>
-      <trans-unit id="60251958d9e05c8cc00abf9645bb0026ebbe4dc3">
-        <source>Subscribe with an account on <x id="INTERPOLATION" equiv-text="{{ videoChannel.host }}"/></source>
-        <target>Tilaa tilillä instanssissa <x id="INTERPOLATION" equiv-text="{{ videoChannel.host }}"/></target>
-        <context-group name="null">
-          <context context-type="linenumber">39</context>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">50</context></context-group></trans-unit><trans-unit id="c7e2b4c04a0459ebc4d2e54e419abb679bc713f2" datatype="html">
+        <source>Subscribe with an account on this instance</source><target state="new">Subscribe with an account on this instance</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/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">39</context></context-group>
       </trans-unit>
+      
       <trans-unit id="e7adf422424a61b71465d183f9d44bf956482ef0">
         <source>Subscribe with your local account</source>
         <target>Tilaa paikallisella tilillä</target>
         <context-group name="null">
           <context context-type="linenumber">40</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">40</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">54</context></context-group></trans-unit>
       <trans-unit id="5047522cc670b1f4a288bce07f9b1c5061e913ed">
         <source>Subscribe with a Mastodon account:</source>
         <target>Tilaa Mastodon-tilillä</target>
         <context-group name="null">
           <context context-type="linenumber">43</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">43</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">57</context></context-group></trans-unit>
       <trans-unit id="d8758664cadd6452256ca25ca0c7259074f427c1">
         <source>Using a syndication feed</source>
         <target>Käytetään syndikointisyötettä</target>
         <context-group name="null">
           <context context-type="linenumber">48</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">48</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">62</context></context-group></trans-unit>
       <trans-unit id="d5e5bc7d213694fc0414a76f0ff3085bae44268a">
         <source>Subscribe via RSS</source>
         <target>Tilaa RSS-muodossa</target>
         <context-group name="null">
           <context context-type="linenumber">49</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">49</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context><context context-type="linenumber">63</context></context-group></trans-unit>
       <trans-unit id="4913054c95f5ba14c351ab1b787f7abac97bfdd3">
         <source>
     <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/>Remote subscribe<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/>
@@ -1091,7 +1068,7 @@
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/moderation/user-ban-modal.component.html</context><context context-type="linenumber">23</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/confirm/confirm.component.html</context><context context-type="linenumber">19</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">79</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">23</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/moderation/user-ban-modal.component.html</context><context context-type="linenumber">23</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/shared/confirm/confirm.component.html</context><context context-type="linenumber">19</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">84</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">23</context></context-group></trans-unit>
       <trans-unit id="35fdca47605de8113a0db7f587f7c099abec8020">
         <source>Ban this user</source>
         <target>Sulje tämä käyttäjä</target>
@@ -1125,6 +1102,36 @@
           <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="d780b02074a6317126378e0365e1066c890a3570" datatype="html">
+        <source>
+      If you are looking for an account…
+    </source><target state="new">
+      If you are looking for an account…
+    </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/login/login.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit><trans-unit id="79dacac459775e2cf163bce6c3f05ed814f82ba2" datatype="html">
+        <source>
+      Currently this instance doesn't allow for user registration, but you can find an instance
+      that gives you the possibility to sign up for an account and upload your videos there.
+
+      <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
+
+      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="new">
+      Currently this instance doesn't allow for user registration, but you can find an instance
+      that gives you the possibility to sign up for an account and upload your videos there.
+
+      <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
+
+      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>"/>.
+    </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/login/login.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="ae3cb52bf2dee3101ee654812b5d16e8665a9453">
         <source>Request new verification email.</source>
@@ -1132,26 +1139,26 @@
         <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">7</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.html</context><context context-type="linenumber">16</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">22</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+verify-account/verify-account-email/verify-account-email.component.html</context><context context-type="linenumber">16</context></context-group></trans-unit>
       <trans-unit id="e08a77594f3d89311cdf6da5090044270909c194">
         <source>User</source>
         <target>Käyttäjä</target>
         <context-group name="null">
           <context context-type="linenumber">13</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">13</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">13</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">28</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register.component.html</context><context context-type="linenumber">13</context></context-group></trans-unit>
       <trans-unit id="51ef29329faccb28d94369897068897d1b3d0478">
         <source>Username or email address</source>
         <target>Käyttäjänimi tai sähköpostiosoite</target>
         <context-group name="null">
           <context context-type="linenumber">15</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">15</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">30</context></context-group></trans-unit>
       <trans-unit id="02c4360c2d956e74ed6bb1f71e86812af0e19b87">
         <source>or create an account</source>
         <target>
@@ -1160,26 +1167,10 @@
         <context-group name="null">
           <context context-type="linenumber">18</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">18</context></context-group>
-      </trans-unit>
-      <trans-unit id="d6290381021b16febc426d3e3a52dda83991ce0b">
-        <source>or create an account on another instance</source>
-        <target>
-          tai luo uusi tili erissä instanssissa
-        </target>
-        <context-group name="null">
-          <context context-type="linenumber">22</context>
-        </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">22</context></context-group>
-      </trans-unit>
-      <trans-unit id="76e1f485e6ead4c84b606f46d413878881d66ad3">
-        <source>User registration is not allowed on this instance, but you can register on many others!</source>
-        <target>Käyttäjätilin luominen on kielletty tässä instanssissa, mutta voit rekisteröityä monessa muussa!</target>
-        <context-group name="null">
-          <context context-type="linenumber">28</context>
-        </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">28</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">33</context></context-group></trans-unit>
+      
+      
       <trans-unit id="c32ef07f8803a223a83ed17024b38e8d82292407">
         <source>Password</source>
         <target>Salasana</target>
@@ -1195,15 +1186,15 @@
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">39</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">42</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">31</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">31</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">27</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">52</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">54</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">44</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">47</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">31</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">31</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">27</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">52</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+register/register-step-user.component.html</context><context context-type="linenumber">54</context></context-group></trans-unit>
       <trans-unit id="b87e81682959464211443afc3e23c506865d2eda">
         <source>I forgot my password</source>
         <target>Unohdin salasanani</target>
         <context-group name="null">
           <context context-type="linenumber">45</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">45</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">50</context></context-group></trans-unit>
       <trans-unit id="6765b4c916060f6bc42d9bb69e80377dbcb5e4e9">
         <source>Login</source>
         <target>Kirjaudu sisään</target>
@@ -1212,22 +1203,19 @@
         </context-group>
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">52</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">46</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">57</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">46</context></context-group></trans-unit>
       <trans-unit id="d2eb6c5d41f70d4b8c0937e7e19e196143b47681">
         <source>Forgot your password</source>
         <target>Unohda salasanasi</target>
         <context-group name="null">
           <context context-type="linenumber">58</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">58</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">63</context></context-group></trans-unit>
       <trans-unit id="8f7dd0009f7dc9e4e3f1d9f43f944a3aa7cf737a" datatype="html">
         <source>We are sorry, you cannot recover your password because your instance administrator did not configure the PeerTube email system.</source><target state="new">We are sorry, you cannot recover your password because your instance administrator did not configure the PeerTube email system.</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/login/login.component.html</context>
-          <context context-type="linenumber">65</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">70</context></context-group></trans-unit>
       <trans-unit id="244aae9346da82b0922506c2d2581373a15641cc">
         <source>Email</source>
         <target>Sähköposti</target>
@@ -1243,24 +1231,24 @@
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">70</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">19</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">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">41</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">30</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/login/login.component.html</context><context context-type="linenumber">75</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">19</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">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">41</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">30</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>
       <trans-unit id="69b6ac577a19acc39fc0c22342092f327fff2529">
         <source>Email address</source>
         <target>Sähköpostiosoite</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">72</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html</context><context context-type="linenumber">10</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">77</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+signup/+verify-account/verify-account-ask-send-email/verify-account-ask-send-email.component.html</context><context context-type="linenumber">10</context></context-group></trans-unit>
       <trans-unit id="78be69e4d26b3b654c49962839d8545e61bf8b55">
         <source>Send me an email to reset my password</source>
         <target>Lähetä minulle sähköpostiviesti nollatakseni salasanani</target>
         <context-group name="null">
           <context context-type="linenumber">82</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">82</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/login/login.component.html</context><context context-type="linenumber">87</context></context-group></trans-unit>
       <trans-unit id="2ba14c37f3b23553b2602c5e535d0ff4916f24aa">
         <source>Reset my password</source>
         <target>
@@ -1294,15 +1282,14 @@
           <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="9167c6d3c4c3b74373cf1e90997e4966844ded1a">
-        <source><x id="INTERPOLATION" equiv-text="{{ pagination.totalItems | myNumberFormatter }}"/> results</source>
-        <target><x id="INTERPOLATION" equiv-text="{{ pagination.totalItems | myNumberFormatter }}"/> tulosta</target>
-        <context-group name="null">
+      </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="new"><x id="INTERPOLATION" equiv-text="{{ pagination.totalItems | myNumberFormatter }}"/> <x id="ICU" equiv-text="{pagination.totalItems, plural, =1 {...} other {...}}"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/search/search.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
-        <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="4c3960fb1d9b07d1db3b5bda3ee40019211830dc">
         <source>for <x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/><x id="INTERPOLATION" equiv-text="{{ currentSearch }}"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/> </source>
         <target>
@@ -1639,7 +1626,7 @@
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">55</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">76</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/accounts.component.html</context><context context-type="linenumber">38</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>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">55</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">76</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/accounts.component.html</context><context context-type="linenumber">44</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channels.component.html</context><context context-type="linenumber">33</context></context-group></trans-unit>
       <trans-unit id="47546e45bbb476baaaad38244db444c427ddc502">
         <source>Playlists</source>
         <target>Soittolistat</target>
@@ -1717,7 +1704,7 @@
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">114</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/accounts.component.html</context><context context-type="linenumber">40</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channels.component.html</context><context context-type="linenumber">32</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/menu/menu.component.html</context><context context-type="linenumber">114</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/accounts.component.html</context><context context-type="linenumber">46</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channels.component.html</context><context context-type="linenumber">35</context></context-group></trans-unit>
       <trans-unit id="4752e5e33da1c3396d3248eb8fef59bca5d00cb3">
         <source>Show keyboard shortcuts</source>
         <target>Näytä pikanäppäimet</target>
@@ -1859,7 +1846,7 @@
           <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">65</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">231</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">65</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="dc67060f94f0f2b58549f54a5c07925dffd20238">
         <source>Display sensitive content</source>
         <target>Näytä arkaluonteinen sisältö</target>
@@ -1893,7 +1880,7 @@
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">100</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">66</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">196</context></context-group></trans-unit><trans-unit id="265ee68edfe57e510270da31ec99f67d94346009" datatype="html">
+      <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">100</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">66</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><trans-unit id="265ee68edfe57e510270da31ec99f67d94346009" datatype="html">
         <source>
           Reset
         </source><target state="new">
@@ -1935,7 +1922,7 @@
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">113</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">80</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">205</context></context-group></trans-unit><trans-unit id="0101457b9856145780bc92c54f9477a0bb4abbb8" datatype="html">
+      <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">113</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">80</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">206</context></context-group></trans-unit><trans-unit id="0101457b9856145780bc92c54f9477a0bb4abbb8" datatype="html">
         <source>Any or no license set</source><target state="new">Any or no license set</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/search/search-filters.component.html</context>
@@ -1952,7 +1939,7 @@
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">126</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">94</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">214</context></context-group></trans-unit><trans-unit id="f0cc3929292ee21bc26f607267f31d214a1230ac" datatype="html">
+      <context-group purpose="location"><context context-type="sourcefile">src/app/search/search-filters.component.html</context><context context-type="linenumber">126</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">94</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">215</context></context-group></trans-unit><trans-unit id="f0cc3929292ee21bc26f607267f31d214a1230ac" datatype="html">
         <source>Any or no language set</source><target state="new">Any or no language set</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/search/search-filters.component.html</context>
@@ -1992,37 +1979,7 @@
           <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">173</context></context-group></trans-unit><trans-unit id="f9fdeb0495dd96319d13df9d9536760d0a98d9b5" datatype="html">
-        <source><x id="INTERPOLATION" equiv-text="{{ action.label }}"/></source><target state="new"><x id="INTERPOLATION" equiv-text="{{ action.label }}"/></target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/video/abstract-video-list.html</context>
-          <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">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">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">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">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">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">14</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">173</context></context-group></trans-unit>
       <trans-unit id="41ed53a3f1d4dfc57011d0aba13b8b074e8b41b6">
         <source>Display unlisted and private videos</source>
         <target>Näytä piilotetut ja yksityiset videot</target>
@@ -2099,7 +2056,7 @@
         </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">17</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="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">17</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">224</context></context-group></trans-unit><trans-unit id="19f59c3f026a162a78af887faff8d9b2b11a4e27" datatype="html">
         <source>
                     Tags could be used to suggest relevant recommendations. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
                     There is a maximum of 5 tags. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>
@@ -2189,7 +2146,7 @@
         
         
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/shared/video-edit.component.html</context><context context-type="linenumber">108</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">21</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">37</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">186</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></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">108</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">21</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">37</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">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></trans-unit>
       <trans-unit id="d69f4fafc780cc7dbafb063ca5f11e6f7c91b0c5">
         <source>Schedule publication (<x id="INTERPOLATION" equiv-text="{{ calendarTimezone }}"/>)</source>
         <target>Ajoita julkaisu (<x id="INTERPOLATION" equiv-text="{{ calendarTimezone }}"/>)</target>
@@ -2414,10 +2371,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">74</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">17</context></context-group>
-      </trans-unit>
+        
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.html</context><context context-type="linenumber">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">74</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-update.component.html</context><context context-type="linenumber">3</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-update.component.html</context><context context-type="linenumber">18</context></context-group></trans-unit>
       <trans-unit id="21add64f0f3ebbedf1150ca822c6e149494ab7a9">
         <source>Select the file to upload</source>
         <target>Valitse ladattava tiedosto</target>
@@ -2579,16 +2536,7 @@
         </context-group>
         
       <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.html</context><context context-type="linenumber">30</context></context-group></trans-unit>
-      <trans-unit id="2335f0bd17c63d835b50cfbbcea6c459cb1314c0">
-        <source>Update <x id="INTERPOLATION" equiv-text="{{ video?.name }}"/> </source>
-        <target>
-    Päivitä <x id="INTERPOLATION" equiv-text="{{ video?.name }}"/>
-  </target>
-        <context-group name="null">
-          <context context-type="linenumber">2</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">2</context></context-group>
-      </trans-unit><trans-unit id="7ce8b0d7cc34d4c1ef4a21e990b0a001337bedd1" datatype="html">
+      <trans-unit id="7ce8b0d7cc34d4c1ef4a21e990b0a001337bedd1" datatype="html">
         <source>
         Other videos
       </source><target state="new">
@@ -2836,7 +2784,7 @@
           <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">149</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/shared/channel/avatar.component.html</context><context context-type="linenumber">2</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">150</context></context-group></trans-unit>
       <trans-unit id="0b7f242da10ece3f2995095c455b9a92ebcdd3b4">
         <source>By <x id="INTERPOLATION" equiv-text="{{ video.byAccount }}"/></source>
         <target><x id="INTERPOLATION" equiv-text="{{ video.byAccount }}"/></target>
@@ -2844,7 +2792,7 @@
           <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">153</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">154</context></context-group></trans-unit>
       <trans-unit id="be73b652c2707f42b5d780d0c7b8fc5ea0b1706c">
         <source>Go to the account page</source>
         <target>Mene tilin sivulle</target>
@@ -2853,7 +2801,31 @@
         </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">152</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">63</context></context-group></trans-unit>
+      <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><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.html</context><context context-type="linenumber">63</context></context-group></trans-unit><trans-unit id="d0336848b0c375a1c25ba369b3481ee383217a4f" datatype="html">
+        <source>Subscribe</source><target state="new">Subscribe</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit><trans-unit id="6e215e23505768151b501b7e11dd5b864e604fd9" datatype="html">
+        <source>Subscribe to all channels</source><target state="new">Subscribe to all channels</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit><trans-unit id="c33a843e309de9d67771aa5e666f61e92f4c6216" datatype="html">
+        <source>channels subscribed</source><target state="new">channels subscribed</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit><trans-unit id="e01bfa3629e2133dbf307975446bde047eb8bd1f" datatype="html">
+        <source>{VAR_SELECT, select, undefined {Unsubscribe} other {Unsubscribe from all channels} }</source><target state="new">{VAR_SELECT, select, undefined {Unsubscribe} other {Unsubscribe from all channels} }</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.html</context>
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="f0c5f6f270e70cbe063b5368fcf48f9afc1abd9b">
         <source>Show more</source>
         <target>Näytä lisää</target>
@@ -2861,7 +2833,7 @@
           <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">173</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">174</context></context-group></trans-unit>
       <trans-unit id="5403a767248e304199592271bba3366d2ca3f903">
         <source>Show less</source>
         <target>Näytä vähemmän</target>
@@ -2869,7 +2841,7 @@
           <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">179</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">180</context></context-group></trans-unit>
       <trans-unit id="284b55e2ae9f6e5bc78c92a18ef26da02f380079">
         <source>Originally published</source>
         <target>Alkuperäinen julkaisupäivä</target>
@@ -2877,7 +2849,7 @@
           <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">191</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">192</context></context-group></trans-unit>
       <trans-unit id="4c0ba3cde3b3c58b855ffb4beaa5804a2fc3826b">
         <source>Friendly Reminder:</source>
         <target>Ystävällinen muistutus:</target>
@@ -2885,11 +2857,11 @@
           <context context-type="linenumber">211</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">254</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">255</context></context-group></trans-unit>
       <trans-unit id="9e66f7507eb263abdbab7abafd825f1dc8bc880b" datatype="html">
         <source>the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers.</source><target state="new">the sharing system used for this video implies that some technical information about your system (such as a public IP address) can be sent to other peers.</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.html</context><context context-type="linenumber">255</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">256</context></context-group></trans-unit>
       <trans-unit id="e60c11e1b1dfbbeda577364b8de39ded2d796c5e">
         <source>More information</source>
         <target>Näytä lisää</target>
@@ -2897,7 +2869,7 @@
           <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">258</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">259</context></context-group></trans-unit>
       <trans-unit id="bd499ca7913bb5408fd139a4cb4f863852d5f318">
         <source>Get more information</source>
         <target>Näytä lisätietoa</target>
@@ -2905,7 +2877,7 @@
           <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">258</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">259</context></context-group></trans-unit>
       <trans-unit id="20fc98888baf65b5ba9fe9622dc036fa8dec6a5f">
         <source>OK</source>
         <target>
@@ -2915,14 +2887,14 @@
           <context context-type="linenumber">218</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">261</context></context-group></trans-unit><trans-unit id="a8db53a47543132da1a68066f0a9cba0551a8933" datatype="html">
+      <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><trans-unit id="a8db53a47543132da1a68066f0a9cba0551a8933" datatype="html">
         <source>1 Comment</source><target state="new">1 Comment</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context>
           <context context-type="linenumber">6</context>
         </context-group>
-      </trans-unit><trans-unit id="ebfd60b0cd69107312752de2a84724185cd54205" datatype="html">
-        <source><x id="INTERPOLATION" equiv-text="{{ comments.length }}"/> Comments</source><target state="new"><x id="INTERPOLATION" equiv-text="{{ comments.length }}"/> Comments</target>
+      </trans-unit><trans-unit id="8164af7bbe7fb9a3d2064ddf2627a7a4d5446575" datatype="html">
+        <source><x id="INTERPOLATION" equiv-text="{{ componentPagination.totalItems }}"/> Comments</source><target state="new"><x id="INTERPOLATION" equiv-text="{{ componentPagination.totalItems }}"/> Comments</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comments.component.html</context>
           <context context-type="linenumber">7</context>
@@ -3067,7 +3039,7 @@
           <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">19</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">20</context></context-group></trans-unit>
       <trans-unit id="cb23d4d98007aa4d7123837f4c17a671848377d6">
         <source>Reply</source>
         <target>Vastaa</target>
@@ -3075,10 +3047,10 @@
           <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">37</context></context-group></trans-unit><trans-unit id="3dc4cf221502c170c7fcd4b2bffc9b3aa46b84bb" datatype="html">
+      <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">38</context></context-group></trans-unit><trans-unit id="3dc4cf221502c170c7fcd4b2bffc9b3aa46b84bb" datatype="html">
         <source>This comment has been deleted</source><target state="new">This comment has been deleted</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/videos/+video-watch/comment/video-comment.component.html</context><context context-type="linenumber">54</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">55</context></context-group></trans-unit>
       <trans-unit id="80dbb8ba42b97a9ec035c0ba09f45c07ea07096c">
         <source>Users</source>
         <target>
@@ -3868,8 +3840,8 @@
         <context-group name="null">
           <context context-type="linenumber">23</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugin-search/plugin-search.component.html</context><context context-type="linenumber">23</context></context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/search/search.component.html</context><context context-type="linenumber">5</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+admin/plugins/plugin-search/plugin-search.component.html</context><context context-type="linenumber">23</context></context-group></trans-unit>
       <trans-unit id="b1363973a9482c7b0a7c4a1d066fd64625d40207">
         <source>No results.</source>
         <target>
@@ -4254,16 +4226,16 @@
         <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">242</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">240</context></context-group></trans-unit>
       <trans-unit id="68bda70e0dd4f7f91549462e55f1b2a1602d8402">
         <source>Signup limit</source>
         <target>Rekisteröintiraja</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">247</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">244</context></context-group></trans-unit>
       <trans-unit id="4d13a9cd5ed3dcee0eab22cb25198d43886942be">
         <source>Users</source>
         <target>Tilejä</target>
@@ -4285,23 +4257,21 @@
           <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">273</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="29aa67f13fd34a2421ff9d7de7d5142790676b9e">
-        <source>Video import with HTTP URL (i.e. YouTube) enabled</source>
-        <target>Videon tuonti HTTP-osoitteella (esim. YouTube) on päällä</target>
-        <context-group name="null">
+      </trans-unit><trans-unit id="6c65014c4ccf5a3ca7b0f4bdb17ff00578004420" datatype="html">
+        <source>Allow import with HTTP URL (i.e. YouTube)</source><target state="new">Allow import with HTTP URL (i.e. YouTube)</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">294</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">294</context></context-group>
-      </trans-unit>
-      <trans-unit id="05fdf7b5be1c3a7126e3c06d81da3134981b0a9e">
-        <source>Video import with a torrent file or a magnet URI enabled</source>
-        <target>Videon tuonti torrent-tiedostosta tai magnet-osoitteesta on päällä</target>
-        <context-group name="null">
+      </trans-unit><trans-unit id="ec3d83c2ae784e843fbe96eb368f9e6e0f26cc2e" datatype="html">
+        <source>Allow import with a torrent file or a magnet URI</source><target state="new">Allow import with a torrent file or a magnet URI</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">301</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">301</context></context-group>
       </trans-unit>
+      
+      
       <trans-unit id="51ee3dafebdb4c05d300b18bb4a997c10b1d7891">
         <source>Auto-blacklist</source>
         <target>Automaattinen estolista</target>
@@ -4309,63 +4279,70 @@
           <context context-type="linenumber">309</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">309</context></context-group>
-      </trans-unit>
-      <trans-unit id="b78d9ff04931504a241a6c6fc394d677c7a0946c" datatype="html">
-        <source>New videos of users automatically blacklisted enabled</source><target state="new">New videos of users automatically blacklisted enabled</target>
+      </trans-unit><trans-unit id="bbed7359eacdb7bed596f6e21211f5bb131f69be" datatype="html">
+        <source>Videos of regular users will stay private until a moderator reviews them. Can be overriden per user.</source><target state="new">Videos of regular users will stay private until a moderator reviews them. Can be overriden per user.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">321</context>
+        </context-group>
+      </trans-unit><trans-unit id="680ef3c95b9b6264dfb992c82e91d64312b133db" datatype="html">
+        <source>Blacklist new videos automatically</source><target state="new">Blacklist new videos automatically</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">318</context>
         </context-group>
       </trans-unit>
+      
       <trans-unit id="2c2af9710d6f6c3ab117c3a74f5aa9d40710f5b9">
         <source>Instance followers</source>
         <target>Instanssin seuraajat</target>
         <context-group name="null">
           <context context-type="linenumber">327</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">327</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">331</context></context-group></trans-unit>
       <trans-unit id="fda0a09374e5d89c25522b7c49cf8f440cfb9db8">
         <source>Other instances can follow your instance</source>
         <target>Muut instanssit voivat seurata instanssiasi</target>
         <context-group name="null">
           <context context-type="linenumber">335</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">335</context></context-group>
-      </trans-unit>
-      <trans-unit id="1df9e784f36295ebd75a87980873e5bce62e8cd9" datatype="html">
-        <source>Manually approve new instance follower</source><target state="new">Manually approve new instance follower</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">339</context></context-group></trans-unit><trans-unit id="3d9ffce2b1f284cb60067de15a313d3ecde0875f" datatype="html">
+        <source>Manually approve new instance followers</source><target state="new">Manually approve new instance followers</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">342</context>
+          <context context-type="linenumber">346</context>
         </context-group>
       </trans-unit>
+      
       <trans-unit id="5360e0c21d65618c91b61573693dc01cf4e3f3ed" datatype="html">
         <source>Instance followings</source><target state="new">Instance followings</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">352</context></context-group></trans-unit><trans-unit id="9bef6fc7194e11d18fdcac6aaccc816fe9ffc5a7" datatype="html">
+        <source>⚠️ This functionality requires a lot of attention and extra moderation.</source><target state="new">⚠️ This functionality requires a lot of attention and extra moderation.</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">348</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="2704064923ec2275d8ba7892e0ed03d7fe3b7fdf" datatype="html">
-        <source>Automatically follow other instances that follow you</source><target state="new">Automatically follow other instances that follow you</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">357</context>
+          <context context-type="linenumber">364</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="e2790f53c14b8d5d068791aece9655ddb5eb9847" datatype="html">
-        <source>Automatically follow instance of the public index (below)</source><target state="new">Automatically follow instance of the public index (below)</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">366</context>
+          <context context-type="linenumber">377</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="2704064923ec2275d8ba7892e0ed03d7fe3b7fdf" datatype="html">
+        <source>Automatically follow other instances that follow you</source><target state="new">Automatically follow other instances that follow you</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">361</context></context-group></trans-unit>
+      
       <trans-unit id="764910b42b08b8342f7ba5907b258341ec044fa0" datatype="html">
         <source>Index URL</source><target state="new">Index URL</target>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">382</context></context-group></trans-unit><trans-unit id="827523b730c599698d1bdf6a17bcfb500db62c5d" datatype="html">
+        <source>Automatically follow instances of the public index</source><target state="new">Automatically follow instances of the public index</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">371</context>
+          <context context-type="linenumber">374</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ca2283fc765b9f44b69f0175d685dc2443da6011">
@@ -4374,24 +4351,24 @@
         <context-group name="null">
           <context context-type="linenumber">384</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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">398</context></context-group></trans-unit>
       <trans-unit id="55a0f51e38679d3141841e8333da5779d349c587">
         <source>Admin email</source>
         <target>Ylläpidon sähköpostiosoite</target>
         <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">387</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">401</context></context-group></trans-unit>
       <trans-unit id="f9bda6652199995a4bd4424f2e35b748eb0bda8a">
         <source>Enable contact form</source>
         <target>Ota yhteydenottolomake käyttöön</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">398</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">412</context></context-group></trans-unit>
       <trans-unit id="50247a2f9711ea9e9a85aacc46668131e9b424a5">
         <source>Basic configuration</source>
         <target>Peruskokoonpano</target>
@@ -4406,31 +4383,28 @@
         <context-group name="null">
           <context context-type="linenumber">407</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">407</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">421</context></context-group></trans-unit>
       <trans-unit id="7fdb41bbf2ee042ec5f68725a1c16a1c97f3e524">
         <source>Your Twitter username</source>
         <target>Sinun Twitter käyttäjänimi</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">413</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">427</context></context-group></trans-unit>
       <trans-unit id="6e671e839ca889feef0d8ed525d1a44b4b10870c" datatype="html">
         <source>Indicates the Twitter account for the website or platform on which the content was published.</source><target state="new">Indicates the Twitter account for the website or platform on which the content was published.</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">417</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">431</context></context-group></trans-unit>
       <trans-unit id="c0716c28b9d4c9e0b2fd6031334394214e5f9605">
         <source>Instance whitelisted by Twitter</source>
         <target>Twitteri on hyväksynyt instanssin</target>
         <context-group name="null">
           <context context-type="linenumber">431</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">431</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">445</context></context-group></trans-unit>
       <trans-unit id="019148902261d0a0e08affa57dc1517be23858e6" 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/>"/>
@@ -4440,73 +4414,64 @@
                     to see if you instance is whitelisted.
                   </source>
         <target state="new"/>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">435</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">449</context></context-group></trans-unit>
       <trans-unit id="419d940613972cc3fae9c8ea0a4306dbf80616e5">
         <source>Services</source>
         <target>Palvelut</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">405</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">419</context></context-group></trans-unit>
       <trans-unit id="fe22d2c0020e913ee4b75ec22a3abc8814810490">
         <source>Transcoding</source>
         <target>Transkoodaus</target>
         <context-group name="null">
           <context context-type="linenumber">455</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">455</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">469</context></context-group></trans-unit>
       <trans-unit id="fca29003c4ea1226ff8cbee89481758aab0e2be9">
         <source>Transcoding enabled</source>
         <target>Transkoodaus on päällä</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">461</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">475</context></context-group></trans-unit>
       <trans-unit id="6ef2ab819d4441fa8bddf6759b6936783d06616f">
         <source>If you disable transcoding, many videos from your users will not work!</source>
         <target>Jos poistat transkoodauksen käytöstä, niin moni video käyttäjiltäsi lakkaa toimimasta!</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">465</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">479</context></context-group></trans-unit>
       <trans-unit id="84d88c8cf2d2a477c407f3f71c10925730ba6397" datatype="html">
         <source>Allow your users to upload .mkv, .mov, .avi and .flv videos</source><target state="new">Allow your users to upload .mkv, .mov, .avi and .flv videos</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">478</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">492</context></context-group></trans-unit>
       <trans-unit id="0050a55afb9c565df1f9b3f750c2d4adb697698f">
         <source>Allow additional extensions</source>
         <target>Salli muita tiedostopäätteitä</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">475</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">489</context></context-group></trans-unit>
       <trans-unit id="850dc37b31a1b3e8c8ea55d55570f93d39818e33" datatype="html">
         <source>Allow your users to upload audio files that will be merged with the preview file on upload</source><target state="new">Allow your users to upload audio files that will be merged with the preview file on upload</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">489</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">503</context></context-group></trans-unit>
       <trans-unit id="88cfa6e185dd938361d1d9c04314bbd3afb54fb6">
         <source>Allow audio files upload</source>
         <target>Salli äänitiedostojen lataus</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">486</context></context-group>
-      </trans-unit><trans-unit id="3306994fe0385ec78055ef979450e171f8a2396e" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">500</context></context-group></trans-unit><trans-unit id="3306994fe0385ec78055ef979450e171f8a2396e" 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>"/>
 
@@ -4524,17 +4489,11 @@
 
                       <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong>"/>If disabled, breaks federation with PeerTube instances &lt; 2.1<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong>"/>
                     </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">501</context>
-        </context-group>
-      </trans-unit><trans-unit id="ff852c5a22beaff7a8c62447b0a96f9ced7c3ed6" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">515</context></context-group></trans-unit><trans-unit id="ff852c5a22beaff7a8c62447b0a96f9ced7c3ed6" datatype="html">
         <source>WebTorrent support enabled</source><target state="new">WebTorrent support enabled</target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
-          <context context-type="linenumber">498</context>
-        </context-group>
-      </trans-unit><trans-unit id="582131f33901c4fd4438e91550add8231d0648a3" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">512</context></context-group></trans-unit><trans-unit id="582131f33901c4fd4438e91550add8231d0648a3" 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>"/>
 
@@ -4559,12 +4518,12 @@
                       <x id="START_PARAGRAPH" ctype="x-p" equiv-text="&lt;p>"/>If you also enabled WebTorrent support, it will multiply videos storage by 2<x id="CLOSE_PARAGRAPH" ctype="x-p" equiv-text="&lt;/p>"/>
                     </target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">522</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">536</context></context-group></trans-unit>
       
       <trans-unit id="94213e7007705d887db1d366b5abc163122d9202" datatype="html">
         <source>HLS support enabled</source><target state="new">HLS support enabled</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">519</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">533</context></context-group></trans-unit>
       <trans-unit id="a33feadefbb776217c2db96100736314f8b765c2">
         <source>Transcoding threads</source>
         <target>Transkoodaussäiteet</target>
@@ -4572,7 +4531,7 @@
           <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">540</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">554</context></context-group></trans-unit>
       <trans-unit id="6221e8fc0bcfc87cbb03621bca82a6e4e188b75a">
         <source>Resolution <x id="INTERPOLATION" equiv-text="{{resolution.label}}"/> enabled</source>
         <target>Resoluutio <x id="INTERPOLATION" equiv-text="{{resolution.label}}"/> asetettu päälle</target>
@@ -4580,11 +4539,11 @@
           <context context-type="linenumber">532</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">555</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">569</context></context-group></trans-unit>
       <trans-unit id="1fa92c6ce274f878b2625587daa7e08b2a3a8b38" datatype="html">
         <source>Cache</source><target state="new">Cache</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">568</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">582</context></context-group></trans-unit>
       <trans-unit id="d5bf7bea37daff4e018fd11a1b552512e5cb54c0">
         <source>Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them.</source>
         <target>Joitain tiedostoja ei federoija (esikatselut, tekstitykset). Haemme ne suoraan alkuperäisestä instanssista ja tallennamme ne.</target>
@@ -4592,7 +4551,7 @@
           <context context-type="linenumber">545</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">572</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">586</context></context-group></trans-unit>
       <trans-unit id="d00f6c2dcb426440a0a8cd8eec12d094fbfaf6f7">
         <source>Previews cache size</source>
         <target>Esikatselee välimuistin tilaa</target>
@@ -4600,7 +4559,7 @@
           <context context-type="linenumber">552</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">579</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">593</context></context-group></trans-unit>
       <trans-unit id="98970cd72e776308a37dc4e84bebbedffc787607">
         <source>Video captions cache size</source>
         <target>Videotekstityksen välimuistin koko</target>
@@ -4608,7 +4567,7 @@
           <context context-type="linenumber">561</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>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">602</context></context-group></trans-unit>
       <trans-unit id="e3a65df2560e99864bbde695da3a7bdf743a184c">
         <source>Customizations</source>
         <target>Muokkaukset</target>
@@ -4616,7 +4575,7 @@
           <context context-type="linenumber">570</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">597</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">611</context></context-group></trans-unit>
       <trans-unit id="0da9752916950ce6890d897b835c923a71ad9c5c">
         <source>JavaScript</source>
         <target>JavaScript</target>
@@ -4624,11 +4583,11 @@
           <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">602</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">616</context></context-group></trans-unit>
       <trans-unit id="dd9e2ece240f87c7fcc2d8f2c0fc0d187d0cd30c" datatype="html">
         <source>Write JavaScript code directly.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>Example: <x id="START_TAG_PRE" ctype="x-pre" equiv-text="&lt;pre>"/>console.log('my instance is amazing');<x id="CLOSE_TAG_PRE" ctype="x-pre" equiv-text="&lt;/pre>"/> </source><target state="new">Write JavaScript code directly.<x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/>"/>Example: <x id="START_TAG_PRE" ctype="x-pre" equiv-text="&lt;pre>"/>console.log('my instance is amazing');<x id="CLOSE_TAG_PRE" ctype="x-pre" equiv-text="&lt;/pre>"/> </target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">605</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">619</context></context-group></trans-unit>
       <trans-unit id="89c9bfb2fe99372c85311d9895d30e47d2552a02" 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/>"/>
@@ -4645,15 +4604,15 @@
                   </source>
         <target state="new"/>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">624</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">638</context></context-group></trans-unit>
       <trans-unit id="6c44844ebdb7352c433b7734feaa65f01bb594ab">
         <source>Advanced configuration</source>
         <target>Lisäasetukset</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">452</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">466</context></context-group></trans-unit>
       <trans-unit id="dad5a5283e4c853c011a0f03d5a52310338bbff8">
         <source>Update configuration</source>
         <target>Päivitä konfiguraatio</target>
@@ -4661,11 +4620,11 @@
           <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">655</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">669</context></context-group></trans-unit>
       <trans-unit id="f8f8fca3139cba7d4fd6d9578d93e601f639cc83" datatype="html">
         <source>It seems like the configuration is invalid. Please search for potential errors in the different tabs.</source><target state="new">It seems like the configuration is invalid. Please search for potential errors in the different tabs.</target>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">656</context></context-group></trans-unit><trans-unit id="14d2b18cdcc8d19927afd8922ac5f85de336fbd3" datatype="html">
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.html</context><context context-type="linenumber">670</context></context-group></trans-unit><trans-unit id="14d2b18cdcc8d19927afd8922ac5f85de336fbd3" datatype="html">
         <source>Total video quota:</source><target state="new">Total video quota:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.html</context>
@@ -4893,7 +4852,7 @@
         </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">26</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">30</context></context-group></trans-unit>
       <trans-unit id="046c4fa30411e6b1aa46dc51bf82d07b1adf14d4">
         <source>Select the next owner</source>
         <target>Valitse seuraava omistaja</target>
@@ -4901,13 +4860,16 @@
           <context context-type="linenumber">10</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">10</context></context-group>
-      </trans-unit><trans-unit id="addd26e1d0d8a38fcfceeb76642c6f838f9525e3" datatype="html">
-        <source>Search your videos</source><target state="new">Search your videos</target>
+      </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="new">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>"/></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><trans-unit id="addd26e1d0d8a38fcfceeb76642c6f838f9525e3" datatype="html">
+        <source>Search your videos</source><target state="new">Search your videos</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">6</context></context-group></trans-unit>
       <trans-unit id="fbc450919a486e8ed311a7e91a41987d47d83804">
         <source>Accept ownership</source>
         <target>Hyväksy omistajuus</target>
@@ -4997,7 +4959,7 @@
         
         
         
-      <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/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context><context context-type="linenumber">15</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">20</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">20</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>
       <trans-unit id="9dbe4718a5611fbc611fc6b5e0b27df813372c68">
         <source>Create a video channel</source>
         <target>Luo videokanava</target>
@@ -5100,7 +5062,7 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
         </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><context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channels.component.html</context><context context-type="linenumber">23</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context><context context-type="linenumber">18</context></context-group><context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channels.component.html</context><context context-type="linenumber">26</context></context-group></trans-unit>
       <trans-unit id="e006ed166ce188cab168e1ca90435b33d042d913">
         <source>Go the owner account page</source>
         <target>Mene omistajan tilin sivulle</target>
@@ -5109,7 +5071,7 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
         </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">22</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">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">25</context></context-group></trans-unit>
       <trans-unit id="2bc7533f8c8e7d183950ba1094a0acd9efc22e5e">
         <source>Muted instances</source>
         <target>Mykistetyt instanssit</target>
@@ -5190,7 +5152,7 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
         
         
         
-      <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">1</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">1</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">6</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">1</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">1</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">10</context></context-group></trans-unit>
       <trans-unit id="88f1b36ea2f7544792f04ee6b58f8c55aaba5c96">
         <source>Playlist thumbnail</source>
         <target>Soittolistan pikkukuva</target>
@@ -5199,13 +5161,16 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
         </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">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">60</context></context-group>
-      </trans-unit><trans-unit id="a85c7d7a8dcc1ae0d2f945d77f4db36f02ead69b" datatype="html">
-        <source>Search your playlists</source><target state="new">Search your playlists</target>
+      </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="new">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>"/></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>
-      </trans-unit>
+      </trans-unit><trans-unit id="a85c7d7a8dcc1ae0d2f945d77f4db36f02ead69b" datatype="html">
+        <source>Search your playlists</source><target state="new">Search your playlists</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">6</context></context-group></trans-unit>
       <trans-unit id="188014887f7188d90b39e41d9606b91c77c17861">
         <source>No videos in this playlist.</source>
         <target>Ei videoita tällä soittolistalla.</target>
@@ -5319,23 +5284,26 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           <context context-type="linenumber">23</context>
         </context-group>
         <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/accounts.component.html</context><context context-type="linenumber">23</context></context-group>
-      </trans-unit>
-      <trans-unit id="a835d8a12e14eb96919245a0bbafd8069c146578">
-        <source><x id="INTERPOLATION" equiv-text="{{ account.followersCount }}"/> subscribers</source>
-        <target><x id="INTERPOLATION" equiv-text="{{ account.followersCount }}"/> tilaajaa</target>
-        <context-group name="null">
-          <context context-type="linenumber">31</context>
+      </trans-unit><trans-unit id="68949525c4d9a901e0cd15a94e3fc8d2711e9918" datatype="html">
+        <source>Manage</source><target state="new">Manage</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+accounts/accounts.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+video-channels/video-channels.component.html</context>
+          <context context-type="linenumber">19</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/accounts.component.html</context><context context-type="linenumber">31</context></context-group>
       </trans-unit>
+      
       <trans-unit id="6f5a458f827503ac7b8697688ecf3e0490818ee8">
         <source>Video channels</source>
         <target>Videokanavat</target>
         <context-group name="null">
           <context context-type="linenumber">36</context>
         </context-group>
-        <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>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/accounts.component.html</context><context context-type="linenumber">42</context></context-group></trans-unit>
       <trans-unit id="87f77a03c185ea644ed8378a562a2d0225513974">
         <source>This account does not have channels.</source>
         <target>Tällä käyttäjällä ei ole kanavia.</target>
@@ -5343,6 +5311,16 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           <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>
+      </trans-unit><trans-unit id="f15780bbd2d7fa777071975f7445e98a33065e38" datatype="html">
+        <source>{VAR_PLURAL, plural, =1 {1 subscriber} other {<x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount }}"/> subscribers} }</source><target state="new">{VAR_PLURAL, plural, =1 {1 subscriber} other {<x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount }}"/> subscribers} }</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+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">23</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="f36bd6a1570cb9b0a5023870f35160957cad2a8f">
         <source>See this video channel</source>
@@ -5351,15 +5329,14 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           <context context-type="linenumber">8</context>
         </context-group>
         <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context><context context-type="linenumber">8</context></context-group>
-      </trans-unit>
-      <trans-unit id="4f04879385d6e3b0cf5fba6bb08983a55f73b696">
-        <source>This channel does not have videos.</source>
-        <target>Tällä kanavalla ei ole videoita.</target>
-        <context-group name="null">
+      </trans-unit><trans-unit id="7bfe8fdef5d1a90e5bf286ec6ed4c079522a9b44" datatype="html">
+        <source>This channel doesn't have any videos.</source><target state="new">This channel doesn't have any videos.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-video-channels/account-video-channels.component.html</context><context context-type="linenumber">19</context></context-group>
       </trans-unit>
+      
       <trans-unit id="163036c333f1c01161da476032ba41faaa8f0218" datatype="html">
         <source>Show this channel</source><target state="new">Show this channel</target>
         <context-group purpose="location">
@@ -5391,7 +5368,7 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           <context context-type="linenumber">25</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channels.component.html</context><context context-type="linenumber">31</context></context-group></trans-unit>
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channels.component.html</context><context context-type="linenumber">34</context></context-group></trans-unit>
       <trans-unit id="1380539d91f77f565de6e21ce210da891e6644b8">
         <source>Support this channel</source>
         <target>Tue kanavaa</target>
@@ -5683,13 +5660,15 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           <context context-type="linenumber">25</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">69</context></context-group></trans-unit><trans-unit id="0dcd37e1600ea24299e1c2daa14869568ea33785" datatype="html">
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">69</context></context-group></trans-unit><trans-unit id="d0a97e9255fb49b92504d36516f902f440bc8878" datatype="html">
         <source>
-        PeerTube uses the BitTorrent protocol to share bandwidth between users.
-        This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video.
+        PeerTube uses the BitTorrent protocol to share bandwidth between users by default to help lower the load on the server,
+        but ultimately leaves you the choice to switch back to regular streaming exclusively from the server of the video. What
+        follows applies only if you want to keep using the P2P mode of PeerTube.
       </source><target state="new">
-        PeerTube uses the BitTorrent protocol to share bandwidth between users.
-        This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video.
+        PeerTube uses the BitTorrent protocol to share bandwidth between users by default to help lower the load on the server,
+        but ultimately leaves you the choice to switch back to regular streaming exclusively from the server of the video. What
+        follows applies only if you want to keep using the P2P mode of PeerTube.
       </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
@@ -5704,7 +5683,7 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           <context context-type="linenumber">32</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">76</context></context-group></trans-unit><trans-unit id="14d3bc3dafb4a09f3c79daac07ebf30e76457f63" datatype="html">
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">82</context></context-group></trans-unit><trans-unit id="14d3bc3dafb4a09f3c79daac07ebf30e76457f63" datatype="html">
         <source>
         In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video.
         In practice, this is much more difficult because:
@@ -5712,11 +5691,8 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
         In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video.
         In practice, this is much more difficult because:
       </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
-          <context context-type="linenumber">78</context>
-        </context-group>
-      </trans-unit><trans-unit id="fc899a02306f4fd2ce20978136d252dd6eb346cf" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">84</context></context-group></trans-unit><trans-unit id="fc899a02306f4fd2ce20978136d252dd6eb346cf" datatype="html">
         <source>
           An HTTP request has to be sent on each tracker for each video to spy.
           If we want to spy all PeerTube's videos, we have to send as many requests as there are videos (so potentially a lot)
@@ -5724,11 +5700,8 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           An HTTP request has to be sent on each tracker for each video to spy.
           If we want to spy all PeerTube's videos, we have to send as many requests as there are videos (so potentially a lot)
         </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
-          <context context-type="linenumber">84</context>
-        </context-group>
-      </trans-unit><trans-unit id="bf2148ec3190556873bd0ca0c805de3a608b10cc" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">90</context></context-group></trans-unit><trans-unit id="bf2148ec3190556873bd0ca0c805de3a608b10cc" datatype="html">
         <source>
           For each request sent, the tracker returns random peers at a limited number.
           For instance, if there are 1000 peers in the swarm and the tracker sends only 20 peers for each request, there must be at least 50
@@ -5738,21 +5711,15 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           For instance, if there are 1000 peers in the swarm and the tracker sends only 20 peers for each request, there must be at least 50
           requests sent to know every peers in the swarm
         </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
-          <context context-type="linenumber">89</context>
-        </context-group>
-      </trans-unit><trans-unit id="3f47eec5fb00ae46a0035cc8f9e428e3d549e337" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">95</context></context-group></trans-unit><trans-unit id="3f47eec5fb00ae46a0035cc8f9e428e3d549e337" datatype="html">
         <source>
           Those requests have to be sent regularly to know who starts/stops watching a video. It is easy to detect that kind of behaviour
         </source><target state="new">
           Those requests have to be sent regularly to know who starts/stops watching a video. It is easy to detect that kind of behaviour
         </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
-          <context context-type="linenumber">95</context>
-        </context-group>
-      </trans-unit><trans-unit id="a5089b43b2fd8a2639bc7a4cdfaa90e869f51cc3" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">101</context></context-group></trans-unit><trans-unit id="a5089b43b2fd8a2639bc7a4cdfaa90e869f51cc3" datatype="html">
         <source>
           If an IP address is stored in the tracker, it doesn't mean that the person behind the IP (if this person exists) has watched the
           video
@@ -5760,21 +5727,15 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           If an IP address is stored in the tracker, it doesn't mean that the person behind the IP (if this person exists) has watched the
           video
         </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
-          <context context-type="linenumber">99</context>
-        </context-group>
-      </trans-unit><trans-unit id="ff5458261525060246f1f49a740c8d094dc4bac4" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">105</context></context-group></trans-unit><trans-unit id="ff5458261525060246f1f49a740c8d094dc4bac4" datatype="html">
         <source>
           The IP address is a vague information: usually, it regularly changes and can represent many persons or entities
         </source><target state="new">
           The IP address is a vague information: usually, it regularly changes and can represent many persons or entities
         </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
-          <context context-type="linenumber">104</context>
-        </context-group>
-      </trans-unit><trans-unit id="31c95b65cb16d779069e65e82e68690f712c4a5c" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">110</context></context-group></trans-unit><trans-unit id="31c95b65cb16d779069e65e82e68690f712c4a5c" datatype="html">
         <source>
           Web peers are not publicly accessible: because we use WebRTC inside the web browser (<x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>with the
           WebTorrent library<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/>), the protocol is different from classic BitTorrent.
@@ -5788,11 +5749,8 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           to forward the information to.
           See <x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a>"/>this document<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> for more information
         </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
-          <context context-type="linenumber">108</context>
-        </context-group>
-      </trans-unit><trans-unit id="e916a82a25fb892f83d2b63ca55594dc7d02f36a" datatype="html">
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">114</context></context-group></trans-unit><trans-unit id="e916a82a25fb892f83d2b63ca55594dc7d02f36a" datatype="html">
         <source>
         The worst-case scenario of an average person spying on their friends is quite unlikely.
         There are much more effective ways to get that kind of information.
@@ -5800,11 +5758,8 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
         The worst-case scenario of an average person spying on their friends is quite unlikely.
         There are much more effective ways to get that kind of information.
       </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
-          <context context-type="linenumber">117</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">123</context></context-group></trans-unit>
       
       
       
@@ -5820,19 +5775,19 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           <context context-type="linenumber">74</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">122</context></context-group></trans-unit><trans-unit id="1a834063d0b70b0e4f29fd9d685838fee7034099" datatype="html">
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">128</context></context-group></trans-unit><trans-unit id="1fd22031e4f7920db2300cc76ee9c8516b25f50d" datatype="html">
         <source>
-        The threats to privacy in YouTube are different from PeerTube's.
+        The threats to privacy with YouTube are different from PeerTube's.
         In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you.
         Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics).
       </source><target state="new">
-        The threats to privacy in YouTube are different from PeerTube's.
+        The threats to privacy with YouTube are different from PeerTube's.
         In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you.
         Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics).
       </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
-          <context context-type="linenumber">124</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       
@@ -5843,7 +5798,7 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           <context context-type="linenumber">82</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">130</context></context-group></trans-unit><trans-unit id="301e86f807ed659ff42d3b4bba6e03b88bff7907" datatype="html">
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">136</context></context-group></trans-unit><trans-unit id="301e86f807ed659ff42d3b4bba6e03b88bff7907" datatype="html">
         <source>
         Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing
         your IP in their connection logs: ISP/routers/trackers/CDN and more.
@@ -5855,11 +5810,8 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
         PeerTube is transparent about it: we warn you that if you want to keep your IP private, you must use a VPN or Tor Browser.
         Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense.
       </target>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
-          <context context-type="linenumber">132</context>
-        </context-group>
-      </trans-unit>
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">138</context></context-group></trans-unit>
       
       <trans-unit id="8ce78dd287b9a9dde5079916425ea66466530e41">
         <source>What will be done to mitigate this problem?</source>
@@ -5868,50 +5820,60 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           <context context-type="linenumber">90</context>
         </context-group>
         
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">139</context></context-group></trans-unit><trans-unit id="9e3dbfc740e16e7ba825649779271ef987619d06" datatype="html">
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">145</context></context-group></trans-unit><trans-unit id="db4d65ed605b948169d51eac4c1b2ff662088eb7" datatype="html">
         <source>
-        PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released.
-        In the meantime, we want to test different ideas related to this issue:
+        PeerTube wants to deliver the best countermeasures possible, to give you more choice
+        and render attacks less likely. Here is what we put in place so far:
       </source><target state="new">
-        PeerTube is in its early stages, and want to deliver the best countermeasures possible by the time the stable is released.
-        In the meantime, we want to test different ideas related to this issue:
+        PeerTube wants to deliver the best countermeasures possible, to give you more choice
+        and render attacks less likely. Here is what we put in place so far:
       </target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
-          <context context-type="linenumber">141</context>
+          <context context-type="linenumber">147</context>
         </context-group>
-      </trans-unit>
-      
-      <trans-unit id="d32608aba08c6bb3cc4e4e8ec6223e5f4e78ca19" datatype="html">
-        <source>Set a limit to the number of peers sent by the tracker</source><target state="new">Set a limit to the number of peers sent by the tracker</target>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">147</context></context-group></trans-unit>
-      <trans-unit id="a6d732b614143f862e69798046dc0868716547e5" datatype="html">
-        <source>Set a limit on the request frequency received by the tracker (being tested)</source><target state="new">Set a limit on the request frequency received by the tracker (being tested)</target>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">148</context></context-group></trans-unit>
-      <trans-unit id="ba77e356eaa5c06caaf5c8734c361d1a5415fe1c" datatype="html">
-        <source>Ring a bell if there are unusual requests (being tested)</source><target state="new">Ring a bell if there are unusual requests (being tested)</target>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">149</context></context-group></trans-unit>
-      <trans-unit id="81861ff8a71c8a5881cdf66417f3bddb753f0e18">
-        <source>Disable P2P from the administration interface</source>
-        <target>Poista vertaisverkko (P2P) käytöstä ylläpidon hallintapaneelista</target>
-        <context-group name="null">
-          <context context-type="linenumber">101</context>
+      </trans-unit><trans-unit id="89c0c2c3150b99bbea20214895df56c8f8d6125d" datatype="html">
+        <source>We set a limit to the number of peers sent by the tracker</source><target state="new">We set a limit to the number of peers sent by the tracker</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
+          <context context-type="linenumber">153</context>
         </context-group>
-        
-      <context-group purpose="location"><context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context><context context-type="linenumber">150</context></context-group></trans-unit><trans-unit id="7572e6867edf041215b9986a272e5db7967e94d6" datatype="html">
-        <source>An automatic video redundancy program: we wouldn't know if the IP downloaded the video on purpose or if it was the
-          automatized program
-        </source><target state="new">An automatic video redundancy program: we wouldn't know if the IP downloaded the video on purpose or if it was the
-          automatized program
-        </target>
+      </trans-unit><trans-unit id="b23c2b01db8b09f1a9bc6144d66291e28f02daf4" datatype="html">
+        <source>We set a limit on the request frequency received by the tracker</source><target state="new">We set a limit on the request frequency received by the tracker</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
-          <context context-type="linenumber">151</context>
+          <context context-type="linenumber">154</context>
         </context-group>
-      </trans-unit><trans-unit id="eebbc9b6d037b9c08225b769a5f3f333b2789500" datatype="html">
+      </trans-unit><trans-unit id="b6f5d5d1aab25c1e675c66ea5dbb987654e9c0b0" datatype="html">
+        <source>Allow instance admins to disable P2P from the administration interface</source><target state="new">Allow instance admins to disable P2P from the administration interface</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
+          <context context-type="linenumber">155</context>
+        </context-group>
+      </trans-unit><trans-unit id="85755719c08571f7f5b7c5b391329b7e4e7ccc7b" datatype="html">
+        <source>Automatic video redundancy from some instances: one doesn't know if the IP downloaded the video on purpose or if it a server</source><target state="new">Automatic video redundancy from some instances: one doesn't know if the IP downloaded the video on purpose or if it a server</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
+          <context context-type="linenumber">156</context>
+        </context-group>
+      </trans-unit><trans-unit id="a4a403ca6ccc6c4bd590cdfb045474270625ea12" datatype="html">
+        <source>
+        Ultimately, remember you can always disable P2P by toggling it in the video player, or just by disabling
+        WebRTC in your browser.
+      </source><target state="new">
+        Ultimately, remember you can always disable P2P by toggling it in the video player, or just by disabling
+        WebRTC in your browser.
+      </target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+about/about-peertube/about-peertube.component.html</context>
+          <context context-type="linenumber">159</context>
+        </context-group>
+      </trans-unit>
+      
+      
+      
+      
+      <trans-unit id="eebbc9b6d037b9c08225b769a5f3f333b2789500" datatype="html">
         <source>Followers instances</source><target state="new">Followers instances</target>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+about/about-follows/about-follows.component.html</context>
@@ -6149,9 +6111,9 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
         <context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-videos/account-videos.component.ts</context><context context-type="linenumber">1</context></context-group>
-        <context-group purpose="location"><context context-type="sourcefile">src/app/+video-channels/video-channel-videos/video-channel-videos.component.ts</context><context context-type="linenumber">1</context></context-group>
-      </trans-unit>
+        
+        
+      <context-group purpose="location"><context context-type="sourcefile">src/app/+accounts/account-videos/account-videos.component.ts</context><context context-type="linenumber">1</context></context-group></trans-unit>
       <trans-unit id="056a9a97eb47882159d3cf5bd8a9fc2cfe9371bf">
         <source>Username copied</source>
         <target>Käyttäjänimi kopioitu</target>
@@ -7569,6 +7531,12 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location"><context context-type="sourcefile">src/app/core/notification/notifier.service.ts</context><context context-type="linenumber">1</context></context-group>
+      </trans-unit><trans-unit id="8be154f50cd001dd90210bd179ad9018462c9471" datatype="html">
+        <source>Search videos, channels</source><target state="new">Search videos, channels</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/header/header.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="247071f6c9233b7e5bc1d8f46795ab6b032f1fbe">
         <source>Incorrect username or password.</source>
@@ -9200,6 +9168,12 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           <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>
+      </trans-unit><trans-unit id="4104d2ac06bd0103868795086100a871c8dbeb49" datatype="html">
+        <source>Subscribed to all current channels of <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/>. You will be notified of all their new videos.</source><target state="new">Subscribed to all current channels of <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/>. You will be notified of all their new videos.</target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
       </trans-unit><trans-unit id="71470cde6d46e469ed84c0c77b9662685cc830ab" datatype="html">
         <source>Subscribed to <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/>. You will be notified of all their new videos.</source><target state="new">Subscribed to <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/>. You will be notified of all their new videos.</target>
         <context-group purpose="location">
@@ -9215,6 +9189,12 @@ Kun lataat videon tälle kanavalle, niin videon tukiteksti täytetään automaat
           <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>
+      </trans-unit><trans-unit id="3bd3791d3b0ab933981a0b884396af74b0c95e2a" datatype="html">
+        <source>Unsubscribed from all channels of <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/></source><target state="new">Unsubscribed from all channels of <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/></target>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="3e7735fa326fcdc9e1188b6d9ff4b4329312fc26">
         <source>Unsubscribed from <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/></source>