2 files changed, 751 insertions, 488 deletions

diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml
index f7897a8d6..8bb8fefe2 100644
--- a/client/src/locale/source/angular_en_US.xml
+++ b/client/src/locale/source/angular_en_US.xml
@@ -7,71 +7,71 @@
             Cancel
           </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/core/confirm/confirm.component.ts</context>
+          <context context-type="sourcefile">app/core/confirm/confirm.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">72</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.html</context>
           <context context-type="linenumber">26</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.html</context>
           <context context-type="linenumber">35</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-support.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-support.component.html</context>
           <context context-type="linenumber">15</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.html</context>
           <context context-type="linenumber">35</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.html</context>
           <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit><trans-unit id="1d19634967b06f93fd7f20c0663742f8254e6d46" datatype="html">
         <source>(extensions: &lt;x id="INTERPOLATION" equiv-text="{{ allowedExtensionsMessage }}"/&gt;, max size: &lt;x id="INTERPOLATION_1" equiv-text="{{ maxFileSize | bytes }}"/&gt;)</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/shared/forms/reactive-file.component.ts</context>
+          <context context-type="sourcefile">app/shared/forms/reactive-file.component.html</context>
           <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit><trans-unit id="9d5f16f0233b39fa2cd843321407a7358c323ad8" datatype="html">
         <source>&lt;x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/&gt; - &lt;x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/shared/video/video-miniature.component.ts</context>
+          <context context-type="sourcefile">app/shared/video/video-miniature.component.html</context>
           <context context-type="linenumber">12</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search.component.ts</context>
+          <context context-type="sourcefile">app/search/search.component.html</context>
           <context context-type="linenumber">34</context>
         </context-group>
       </trans-unit><trans-unit id="28f86ffd419b869711aa13f5e5ff54be6d70731c" datatype="html">
         <source>Edit</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/shared/misc/edit-button.component.ts</context>
+          <context context-type="sourcefile">app/shared/misc/edit-button.component.html</context>
           <context context-type="linenumber">3</context>
         </context-group>
       </trans-unit><trans-unit id="961a134583d6256df39fbc520d020ebc48e3128d" datatype="html">
         <source>Truncated preview</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/shared/forms/markdown-textarea.component.ts</context>
+          <context context-type="sourcefile">app/shared/forms/markdown-textarea.component.html</context>
           <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit><trans-unit id="f82f53a2544638939a8ba93c0fb1b0a4419c3196" datatype="html">
         <source>Complete preview</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/shared/forms/markdown-textarea.component.ts</context>
+          <context context-type="sourcefile">app/shared/forms/markdown-textarea.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit><trans-unit id="9c71feb04c2beab559f79c41c6127815fb9c1a6f" datatype="html">
         <source>Get help</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/shared/misc/help.component.ts</context>
+          <context context-type="sourcefile">app/shared/misc/help.component.html</context>
           <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit><trans-unit id="12910217fdcdbca64bee06f511639b653d5428ea" datatype="html">
@@ -79,19 +79,19 @@
     Login
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit><trans-unit id="e08a77594f3d89311cdf6da5090044270909c194" datatype="html">
         <source>User</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit><trans-unit id="51ef29329faccb28d94369897068897d1b3d0478" datatype="html">
         <source>Username or email address</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit><trans-unit id="02c4360c2d956e74ed6bb1f71e86812af0e19b87" datatype="html">
@@ -99,7 +99,7 @@
           or create an account
         </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit><trans-unit id="d6290381021b16febc426d3e3a52dda83991ce0b" datatype="html">
@@ -107,101 +107,101 @@
           or create an account on another instance
         </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit><trans-unit id="76e1f485e6ead4c84b606f46d413878881d66ad3" datatype="html">
         <source>User registration is not allowed on this instance, but you can register on many others!</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit><trans-unit id="c32ef07f8803a223a83ed17024b38e8d82292407" datatype="html">
         <source>Password</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">36</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">39</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/reset-password/reset-password.component.ts</context>
+          <context context-type="sourcefile">app/reset-password/reset-password.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/reset-password/reset-password.component.ts</context>
+          <context context-type="sourcefile">app/reset-password/reset-password.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/signup/signup.component.ts</context>
+          <context context-type="sourcefile">app/signup/signup.component.html</context>
           <context context-type="linenumber">47</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/signup/signup.component.ts</context>
+          <context context-type="sourcefile">app/signup/signup.component.html</context>
           <context context-type="linenumber">49</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-create.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">30</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-update.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">30</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-settings.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-settings.component.html</context>
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit><trans-unit id="b87e81682959464211443afc3e23c506865d2eda" datatype="html">
         <source>I forgot my password</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">42</context>
         </context-group>
       </trans-unit><trans-unit id="d2eb6c5d41f70d4b8c0937e7e19e196143b47681" datatype="html">
         <source>Forgot your password</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">59</context>
         </context-group>
       </trans-unit><trans-unit id="244aae9346da82b0922506c2d2581373a15641cc" datatype="html">
         <source>Email</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">64</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/signup/signup.component.ts</context>
+          <context context-type="sourcefile">app/signup/signup.component.html</context>
           <context context-type="linenumber">36</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/signup/signup.component.ts</context>
+          <context context-type="sourcefile">app/signup/signup.component.html</context>
           <context context-type="linenumber">38</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-create.component.ts</context>
+          <context context-type="sourcefile">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">app/+admin/users/user-edit/user-update.component.ts</context>
+          <context context-type="sourcefile">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">app/+admin/users/user-list/user-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.html</context>
           <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit><trans-unit id="69b6ac577a19acc39fc0c22342092f327fff2529" datatype="html">
         <source>Email address</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">66</context>
         </context-group>
       </trans-unit><trans-unit id="78be69e4d26b3b654c49962839d8545e61bf8b55" datatype="html">
         <source>Send me an email to reset my password</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/login/login.component.ts</context>
+          <context context-type="sourcefile">app/login/login.component.html</context>
           <context context-type="linenumber">77</context>
         </context-group>
       </trans-unit><trans-unit id="2ba14c37f3b23553b2602c5e535d0ff4916f24aa" datatype="html">
@@ -209,25 +209,25 @@
     Reset my password
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/reset-password/reset-password.component.ts</context>
+          <context context-type="sourcefile">app/reset-password/reset-password.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit><trans-unit id="7f3bdcce4b2e8c37cd7f0f6c92ef8cff34b039b8" datatype="html">
         <source>Confirm password</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/reset-password/reset-password.component.ts</context>
+          <context context-type="sourcefile">app/reset-password/reset-password.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="3652e5c6e33165264d5271d06cc04ab7123b6df1" datatype="html">
         <source>Confirmed password</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/reset-password/reset-password.component.ts</context>
+          <context context-type="sourcefile">app/reset-password/reset-password.component.html</context>
           <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit><trans-unit id="8bdf8db5eeeaef83184b489b80c1557b516fb3c3" datatype="html">
         <source>Reset my password</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/reset-password/reset-password.component.ts</context>
+          <context context-type="sourcefile">app/reset-password/reset-password.component.html</context>
           <context context-type="linenumber">29</context>
         </context-group>
       </trans-unit><trans-unit id="4499806949402133d08a5029cb5462c5ea25336d" datatype="html">
@@ -235,13 +235,13 @@
     Create an account
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/signup/signup.component.ts</context>
+          <context context-type="sourcefile">app/signup/signup.component.html</context>
           <context context-type="linenumber">3</context>
         </context-group>
       </trans-unit><trans-unit id="a6807b834e01ce165aa61fad157b0ff4288b6bf1" datatype="html">
         <source>Initial video quota:</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/signup/signup.component.ts</context>
+          <context context-type="sourcefile">app/signup/signup.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit><trans-unit id="87b6b2c26215c5e712d3bfe4cc86ba53bc23451c" datatype="html">
@@ -249,51 +249,51 @@
       Unlimited
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/signup/signup.component.ts</context>
+          <context context-type="sourcefile">app/signup/signup.component.html</context>
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit><trans-unit id="08c74dc9762957593b91f6eb5d65efdfc975bf48" datatype="html">
         <source>Username</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/signup/signup.component.ts</context>
+          <context context-type="sourcefile">app/signup/signup.component.html</context>
           <context context-type="linenumber">25</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/signup/signup.component.ts</context>
+          <context context-type="sourcefile">app/signup/signup.component.html</context>
           <context context-type="linenumber">27</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-create.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-update.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit><trans-unit id="2ac776627e18565d7ae85cd7f4cd033bc5d0c88b" datatype="html">
         <source>I have read and agree to the &lt;a href=&apos;/about/instance#terms-section&apos; target=&apos;_blank&apos;rel=&apos;noopener noreferrer&apos;&gt;Terms&lt;/a&gt; of this instance</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/signup/signup.component.ts</context>
+          <context context-type="sourcefile">app/signup/signup.component.html</context>
           <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit><trans-unit id="717a5e3574fec754fbeb348c2d5561c4d81facc4" datatype="html">
         <source>Signup</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/signup/signup.component.ts</context>
+          <context context-type="sourcefile">app/signup/signup.component.html</context>
           <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
           <context context-type="linenumber">22</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit><trans-unit id="9167c6d3c4c3b74373cf1e90997e4966844ded1a" datatype="html">
         <source>&lt;x id="INTERPOLATION" equiv-text="{{ pagination.totalItems | myNumberFormatter }}"/&gt; results</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search.component.ts</context>
+          <context context-type="sourcefile">app/search/search.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit><trans-unit id="4c3960fb1d9b07d1db3b5bda3ee40019211830dc" datatype="html">
@@ -301,13 +301,13 @@
           for &lt;x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span&gt;"/&gt;&lt;x id="INTERPOLATION" equiv-text="{{ currentSearch }}"/&gt;&lt;x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span&gt;"/&gt;
         </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search.component.ts</context>
+          <context context-type="sourcefile">app/search/search.component.html</context>
           <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit><trans-unit id="1298c1d2bbbb7415f5494e800f6775fdb70f4df6" datatype="html">
         <source>Filters</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search.component.ts</context>
+          <context context-type="sourcefile">app/search/search.component.html</context>
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit><trans-unit id="e2dbf0426cbb0b573faf49dffeb7d5bdf16eda5d" datatype="html">
@@ -315,17 +315,17 @@
     No results found
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search.component.ts</context>
+          <context context-type="sourcefile">app/search/search.component.html</context>
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit><trans-unit id="aef5c45fb9c725573d20a6283492e6b80fd2ae96" datatype="html">
         <source>Change the language</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/language-chooser.component.ts</context>
+          <context context-type="sourcefile">app/menu/language-chooser.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit><trans-unit id="b8ccc4f1b3f839fca9bd59e072f715fd487d540f" datatype="html">
@@ -333,7 +333,7 @@
                My public profile
               </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="c84b721e9325c9cce20d92f4dbd66898ab5ec947" datatype="html">
@@ -341,7 +341,7 @@
                 My account
               </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit><trans-unit id="ba7378cdaaa60b4fee17a551b232ad3512dac17d" datatype="html">
@@ -349,231 +349,231 @@
                 Log out
               </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit><trans-unit id="6765b4c916060f6bc42d9bb69e80377dbcb5e4e9" datatype="html">
         <source>Login</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit><trans-unit id="d207cc1965ec0c29e594e0e9917f39bfc276ed87" datatype="html">
         <source>Create an account</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit><trans-unit id="a52dae09be10ca3a65da918533ced3d3f4992238" datatype="html">
         <source>Videos</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">41</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+accounts/accounts.component.ts</context>
+          <context context-type="sourcefile">app/+accounts/accounts.component.html</context>
           <context context-type="linenumber">17</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+video-channels/video-channels.component.ts</context>
+          <context context-type="sourcefile">app/+video-channels/video-channels.component.html</context>
           <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit><trans-unit id="b6b7986bc3721ac483baf20bc9a320529075c807" datatype="html">
         <source>Trending</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit><trans-unit id="8d20c5f5dd30acbe71316544dab774393fd9c3c1" datatype="html">
         <source>Recently added</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit><trans-unit id="eadc17c3df80143992e2d9028dead3199ae6d79d" datatype="html">
         <source>Local</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit><trans-unit id="ac0f81713a84217c9bd1d9bb460245d8190b073f" datatype="html">
         <source>More</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit><trans-unit id="b7648e7aced164498aa843b5c4e8f2f1c36a7919" datatype="html">
         <source>Administration</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">64</context>
         </context-group>
       </trans-unit><trans-unit id="004b222ff9ef9dd4771b777950ca1d0e4cd4348a" datatype="html">
         <source>About</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/menu/menu.component.ts</context>
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
           <context context-type="linenumber">69</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+accounts/accounts.component.ts</context>
+          <context context-type="sourcefile">app/+accounts/accounts.component.html</context>
           <context context-type="linenumber">21</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+video-channels/video-channels.component.ts</context>
+          <context context-type="sourcefile">app/+video-channels/video-channels.component.html</context>
           <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit><trans-unit id="8aa58cf00d949c509df91c621ab38131df0a7599" datatype="html">
         <source>Search...</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/header/header.component.ts</context>
+          <context context-type="sourcefile">app/header/header.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit><trans-unit id="4b3972c3e9485218508a95f7a4ce7758e3f09ced" datatype="html">
         <source>Upload</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/header/header.component.ts</context>
+          <context context-type="sourcefile">app/header/header.component.html</context>
           <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit><trans-unit id="5d43539fc358c3a548b9d487be821db73e2702ff" datatype="html">
         <source>Sort</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">app/search/search-filters.component.html</context>
           <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit><trans-unit id="98acac685fc4b2d35e5d0cf3cd224d247a756c3e" datatype="html">
         <source>Published date</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">app/search/search-filters.component.html</context>
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit><trans-unit id="a02ea1d4e7424ca989929da5e598f379940fdbf2" datatype="html">
         <source>Duration</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">app/search/search-filters.component.html</context>
           <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit><trans-unit id="dc67060f94f0f2b58549f54a5c07925dffd20238" datatype="html">
         <source>Display sensitive content</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">app/search/search-filters.component.html</context>
           <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit><trans-unit id="4f20f2d5a6882190892e58b85f6ccbedfa737952" datatype="html">
         <source>Yes</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">app/search/search-filters.component.html</context>
           <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit><trans-unit id="3d3ae7deebc5949b0c1c78b9847886a94321d9fd" datatype="html">
         <source>No</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">app/search/search-filters.component.html</context>
           <context context-type="linenumber">42</context>
         </context-group>
       </trans-unit><trans-unit id="607de17c2a755f65775881c19e276e7c933bcf94" datatype="html">
         <source>Category</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">app/search/search-filters.component.html</context>
           <context context-type="linenumber">50</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">44</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">144</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">148</context>
         </context-group>
       </trans-unit><trans-unit id="78d6d3ea26777cd0dad8ddbf9b314151678da46c" datatype="html">
         <source>Licence</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">app/search/search-filters.component.html</context>
           <context context-type="linenumber">60</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">58</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">153</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">157</context>
         </context-group>
       </trans-unit><trans-unit id="fe46ccaae902ce974e2441abe752399288298619" datatype="html">
         <source>Language</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">app/search/search-filters.component.html</context>
           <context context-type="linenumber">70</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.html</context>
           <context context-type="linenumber">11</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">72</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">162</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">166</context>
         </context-group>
       </trans-unit><trans-unit id="c8d58c4fbe23e51af3dc8f58cb4a81eac20739e8" datatype="html">
         <source>All of these tags</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">app/search/search-filters.component.html</context>
           <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit><trans-unit id="492d2bd18db0cba03f6d9e3b0c42b8639fbe51ab" datatype="html">
         <source>One of these tags</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">app/search/search-filters.component.html</context>
           <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit><trans-unit id="5ca707824ab93066c7d9b44e1b8bf216725c2c22" datatype="html">
         <source>Filter</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="sourcefile">app/search/search-filters.component.html</context>
           <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit><trans-unit id="c31161d1661884f54fbc5635aad5ce8d4803897e" datatype="html">
         <source>No results.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/video-list/video-trending.component.ts</context>
+          <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/video-list/video-recently-added.component.ts</context>
+          <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/video-list/video-local.component.ts</context>
+          <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+accounts/account-videos/account-videos.component.ts</context>
+          <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.html</context>
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+video-channels/video-channel-videos/video-channel-videos.component.ts</context>
+          <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit><trans-unit id="ff78f059449d44322f627d0f66df07abe476962b" datatype="html">
         <source>Instance</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about.component.ts</context>
+          <context context-type="sourcefile">app/+about/about.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit><trans-unit id="6385c357c1de58ce92c0cf618ecf9cf74b917390" datatype="html">
         <source>PeerTube</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about.component.ts</context>
+          <context context-type="sourcefile">app/+about/about.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit><trans-unit id="5849c589454817c1e991639d3091d8da0e8d6bd2" datatype="html">
@@ -581,61 +581,61 @@
   About &lt;x id="INTERPOLATION" equiv-text="{{ instanceName }}"/&gt; instance
 </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit><trans-unit id="eec715de352a6b114713b30b640d319fa78207a0" datatype="html">
         <source>Description</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+accounts/account-about/account-about.component.ts</context>
+          <context context-type="sourcefile">app/+accounts/account-about/account-about.component.html</context>
           <context context-type="linenumber">3</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">32</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html</context>
           <context context-type="linenumber">12</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
           <context context-type="linenumber">23</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
           <context context-type="linenumber">23</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html</context>
           <context context-type="linenumber">17</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+video-channels/video-channel-about/video-channel-about.component.ts</context>
+          <context context-type="sourcefile">app/+video-channels/video-channel-about/video-channel-about.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit><trans-unit id="69580f2c2dbf4edf7096820ba8c393367352d774" datatype="html">
         <source>Terms</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
           <context context-type="linenumber">16</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit><trans-unit id="9c6e6db693ab265457c6578df179c65694141d27" datatype="html">
         <source>User registration is allowed and</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit><trans-unit id="ac324b07e7c3c972f1c33894eda02dc2917eda5e" datatype="html">
@@ -643,7 +643,7 @@
       this instance provides a baseline quota of &lt;x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/&gt; space for the videos of its users.
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit><trans-unit id="a6865ec6abf6af58f808501d84c8ed6ff8ce46ae" datatype="html">
@@ -651,7 +651,7 @@
       this instance provides unlimited space for the videos of its users.
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
           <context context-type="linenumber">31</context>
         </context-group>
       </trans-unit><trans-unit id="5c856a6a233b6f6c4cc8eed46436d31d2da63fc1" datatype="html">
@@ -659,7 +659,7 @@
     User registration is currently not allowed.
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-instance/about-instance.component.html</context>
           <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit><trans-unit id="a11e3ba2c5aea841de67a3c85892bb61295e94dc" datatype="html">
@@ -667,13 +667,13 @@
   About PeerTube
 </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit><trans-unit id="bd29138e1e17572596ce8f2fe61bcea6ac5fb0bf" datatype="html">
         <source>PeerTube is a federated (ActivityPub) video streaming platform using P2P (WebTorrent) directly in the web browser.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit><trans-unit id="c2bc16265b72b9af4a4374b805931ae03e3f73a5" datatype="html">
@@ -681,7 +681,7 @@
     It is a free and open-source software, under the &lt;x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/&gt;AGPLv3 licence&lt;x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/&gt;.
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit><trans-unit id="a10308f7ac111f5b66d08af0a24fc9ddf143931a" datatype="html">
@@ -689,13 +689,13 @@
     For more information, please visit &lt;x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/&gt;joinpeertube.org&lt;x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/&gt;.
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit><trans-unit id="c02493cfa08b82c468233b83069b5baff23890e1" datatype="html">
         <source>P2P &amp; Privacy</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit><trans-unit id="cd429d53cb8f4a87879301248e38cb85f07fa9d6" datatype="html">
@@ -704,13 +704,13 @@
     This implies that your IP address is stored in the instance&apos;s BitTorrent tracker as long as you download or watch the video.
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit><trans-unit id="e4ce50f3019e3ebe9a479784c6cb68a31c7a8231" datatype="html">
         <source>What are the consequences?</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit><trans-unit id="9a612748b059ad246935df17ef4ec4e6afb43a2a" datatype="html">
@@ -719,7 +719,7 @@
     In practice, this is much more difficult because:
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit><trans-unit id="64f96be62df4a95a0615b6f630ad25d6348a29d3" datatype="html">
@@ -728,7 +728,7 @@
       If we want to spy all PeerTube&apos;s videos, we have to send as many requests as there are videos (so potentially a lot)
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit><trans-unit id="dd9a7a4ee66b0ff3fbb43ba8691ffcd042531611" datatype="html">
@@ -737,7 +737,7 @@
       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
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit><trans-unit id="694cf53adfc2afe8afabf713ab00fa114d5d2f8e" datatype="html">
@@ -745,7 +745,7 @@
       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>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit><trans-unit id="44bbecddbdf2aad1f4bad97cb806560553fb2ab3" datatype="html">
@@ -753,7 +753,7 @@
       If an IP address is stored in the tracker, it doesn&apos;t mean that the person behind the IP (if this person exists) has watched the video
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">47</context>
         </context-group>
       </trans-unit><trans-unit id="fec3239a860de66c718e3442df836b692b8568c3" datatype="html">
@@ -761,7 +761,7 @@
       The IP address is a vague information : usually, it regularly changes and can represent many persons or entities
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">51</context>
         </context-group>
       </trans-unit><trans-unit id="b4c2ef0143270626106b26196d40baf3439aa7b0" datatype="html">
@@ -771,7 +771,7 @@
       See &lt;x id="START_LINK_1" ctype="x-a" equiv-text="&lt;a&gt;"/&gt;this document&lt;x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/&gt; for more information
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit><trans-unit id="50d8e8388f5ceab292850ed828f306c9f2cab389" datatype="html">
@@ -780,13 +780,13 @@
     There are much more effective ways to get that kind of information.
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">62</context>
         </context-group>
       </trans-unit><trans-unit id="4bf47a1ae952bf42a4682a5ecddb0bfb8c9adfaf" datatype="html">
         <source>How does PeerTube compare with YouTube?</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">67</context>
         </context-group>
       </trans-unit><trans-unit id="2432705cbabcb92a8677338901dd5d655383ef4c" datatype="html">
@@ -796,13 +796,13 @@
     Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics).
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">69</context>
         </context-group>
       </trans-unit><trans-unit id="3c2990d5e452bdf2317ff23745db70705d848d99" datatype="html">
         <source>What can I do to limit the exposure of my IP address?</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit><trans-unit id="a545356de272b955258c2a2432b08ec637b65f7e" datatype="html">
@@ -812,13 +812,13 @@
     Thinking that removing P2P from PeerTube will give you back anonymity doesn&apos;t make sense.
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">77</context>
         </context-group>
       </trans-unit><trans-unit id="8ce78dd287b9a9dde5079916425ea66466530e41" datatype="html">
         <source>What will be done to mitigate this problem?</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit><trans-unit id="d8f1c6b816aaf1ebcb936a705dbe88bcef28eaa8" datatype="html">
@@ -827,282 +827,308 @@
     In the meantime, we want to test different ideas related to this issue:
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">85</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>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">91</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>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit><trans-unit id="ba77e356eaa5c06caaf5c8734c361d1a5415fe1c" datatype="html">
         <source>Ring a bell if there are unusual requests (being tested)</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">93</context>
         </context-group>
       </trans-unit><trans-unit id="81861ff8a71c8a5881cdf66417f3bddb753f0e18" datatype="html">
         <source>Disable P2P from the administration interface</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit><trans-unit id="efde279863678ed95a8949a3712c99748bdabfe6" datatype="html">
         <source>An automatic video redundancy program: we wouldn&apos;t know if the IP downloaded the video on purpose or if it was the automatized program</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.ts</context>
+          <context context-type="sourcefile">app/+about/about-peertube/about-peertube.component.html</context>
           <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit><trans-unit id="a835d8a12e14eb96919245a0bbafd8069c146578" datatype="html">
         <source>&lt;x id="INTERPOLATION" equiv-text="{{ account.followersCount }}"/&gt; subscribers</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+accounts/accounts.component.ts</context>
+          <context context-type="sourcefile">app/+accounts/accounts.component.html</context>
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit><trans-unit id="6f5a458f827503ac7b8697688ecf3e0490818ee8" datatype="html">
         <source>Video channels</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+accounts/accounts.component.ts</context>
+          <context context-type="sourcefile">app/+accounts/accounts.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="299f97b8ee9c62d45f2cc01961aa1e5101d6d05a" datatype="html">
         <source>Stats</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+accounts/account-about/account-about.component.ts</context>
+          <context context-type="sourcefile">app/+accounts/account-about/account-about.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+video-channels/video-channel-about/video-channel-about.component.ts</context>
+          <context context-type="sourcefile">app/+video-channels/video-channel-about/video-channel-about.component.html</context>
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit><trans-unit id="8bc634cd9d8c9b684dbfaaf17a522f894bedbffc" datatype="html">
         <source>Joined &lt;x id="INTERPOLATION" equiv-text="{{ account.createdAt | date }}"/&gt;</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+accounts/account-about/account-about.component.ts</context>
+          <context context-type="sourcefile">app/+accounts/account-about/account-about.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit><trans-unit id="8fef247fd0c5bf790151f7661cafc4b7fd0397f3" datatype="html">
         <source>&lt;x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount }}"/&gt; subscribers</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+accounts/account-video-channels/account-video-channels.component.ts</context>
+          <context context-type="sourcefile">app/+accounts/account-video-channels/account-video-channels.component.html</context>
           <context context-type="linenumber">9</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channels.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channels.component.html</context>
           <context context-type="linenumber">21</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+video-channels/video-channels.component.ts</context>
+          <context context-type="sourcefile">app/+video-channels/video-channels.component.html</context>
           <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit><trans-unit id="f36bd6a1570cb9b0a5023870f35160957cad2a8f" datatype="html">
         <source>See this video channel</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+accounts/account-video-channels/account-video-channels.component.ts</context>
+          <context context-type="sourcefile">app/+accounts/account-video-channels/account-video-channels.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit><trans-unit id="cff1428d10d59d14e45edec3c735a27b5482db59" datatype="html">
         <source>Name</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.html</context>
           <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit><trans-unit id="512b045163a7187b2fc5d554e5f59fb3e49e174b" datatype="html">
         <source>Short description</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit><trans-unit id="554488d11165f38b27b8fe230aba8a2e30d57003" datatype="html">
         <source>Default client route</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">54</context>
         </context-group>
       </trans-unit><trans-unit id="1cbeb1eb589bfbe5efce94184cacd3095ca26948" datatype="html">
         <source>Videos Trending</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">57</context>
         </context-group>
       </trans-unit><trans-unit id="1861c96217213992e02dcb77e15ea69e718c9883" datatype="html">
         <source>Videos Recently Added</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit><trans-unit id="b6307f83d9f43bff8d5129a7888e89964ddc3f7f" datatype="html">
         <source>Local videos</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">59</context>
         </context-group>
       </trans-unit><trans-unit id="8551afadb69b3fef89e191f507e8ac84e624e8b9" datatype="html">
         <source>Policy on videos containing sensitive content</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">68</context>
         </context-group>
       </trans-unit><trans-unit id="aa3ef567a1ea22c1e4d0acfdc8f80bc636bf12df" datatype="html">
         <source>With &lt;strong&gt;Do not list&lt;/strong&gt; or &lt;strong&gt;Blur thumbnails&lt;/strong&gt;, a confirmation will be requested to watch the video.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">71</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
           <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit><trans-unit id="5e155c34fb3ed8159bf0a486a366cfbc6874f9fe" datatype="html">
         <source>Do not list</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">76</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
           <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit><trans-unit id="aaa900149c2ca1575ac1918d1ded33fb69830ab2" datatype="html">
         <source>Blur thumbnails</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">77</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit><trans-unit id="010d24ef3c43b2d8f45a4d6cba7d73e12ee1557e" datatype="html">
         <source>Display</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">78</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit><trans-unit id="ca53e66e68986546b7ef820c934145fd7c9c4247" datatype="html">
         <source>Signup enabled</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">90</context>
         </context-group>
       </trans-unit><trans-unit id="68bda70e0dd4f7f91549462e55f1b2a1602d8402" datatype="html">
         <source>Signup limit</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">94</context>
         </context-group>
+      </trans-unit><trans-unit id="a059709f71aa4c0ac219e160e78a738682ca6a36" datatype="html">
+        <source>Import</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">104</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
+          <context context-type="linenumber">34</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit><trans-unit id="e9964673c94eb0b4ff8088c84018217c031f31ce" datatype="html">
+        <source>Video import with HTTP enabled</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">108</context>
+        </context-group>
+      </trans-unit><trans-unit id="05fdf7b5be1c3a7126e3c06d81da3134981b0a9e" datatype="html">
+        <source>Video import with a torrent file or a magnet URI enabled</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">113</context>
+        </context-group>
       </trans-unit><trans-unit id="ca2283fc765b9f44b69f0175d685dc2443da6011" datatype="html">
         <source>Administrator</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit><trans-unit id="55a0f51e38679d3141841e8333da5779d349c587" datatype="html">
         <source>Admin email</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">119</context>
         </context-group>
       </trans-unit><trans-unit id="4d13a9cd5ed3dcee0eab22cb25198d43886942be" datatype="html">
         <source>Users</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">117</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit><trans-unit id="31b3275d999af45fe64c6824e6e017d2e2704f09" datatype="html">
         <source>User default video quota</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">132</context>
         </context-group>
       </trans-unit><trans-unit id="50247a2f9711ea9e9a85aacc46668131e9b424a5" datatype="html">
         <source>Basic configuration</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit><trans-unit id="99cb827741e93125476a0f5b676372d85d15b5fc" datatype="html">
         <source>Twitter</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">136</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">148</context>
         </context-group>
       </trans-unit><trans-unit id="7fdb41bbf2ee042ec5f68725a1c16a1c97f3e524" datatype="html">
         <source>Your Twitter username</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">139</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">151</context>
         </context-group>
       </trans-unit><trans-unit id="6e671e839ca889feef0d8ed525d1a44b4b10870c" datatype="html">
         <source>Indicates the Twitter account for the website or platform on which the content was published.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">142</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">154</context>
         </context-group>
       </trans-unit><trans-unit id="c0716c28b9d4c9e0b2fd6031334394214e5f9605" datatype="html">
         <source>Instance whitelisted by Twitter</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">155</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">167</context>
         </context-group>
       </trans-unit><trans-unit id="3f008a1a07ca42c6ad258fde1bbd80ed74ada19b" datatype="html">
         <source>If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.&lt;br /&gt;
 If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.&lt;br /&gt;&lt;br /&gt;
 Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on &lt;a target=&apos;_blank&apos; rel=&apos;noopener noreferrer&apos; href=&apos;https://cards-dev.twitter.com/validator&apos;&gt;https://cards-dev.twitter.com/validator&lt;/a&gt; to see if you instance is whitelisted.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">156</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">168</context>
         </context-group>
       </trans-unit><trans-unit id="419d940613972cc3fae9c8ea0a4306dbf80616e5" datatype="html">
         <source>Services</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">146</context>
         </context-group>
       </trans-unit><trans-unit id="fe22d2c0020e913ee4b75ec22a3abc8814810490" datatype="html">
         <source>Transcoding</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">164</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">176</context>
         </context-group>
       </trans-unit><trans-unit id="fca29003c4ea1226ff8cbee89481758aab0e2be9" datatype="html">
         <source>Transcoding enabled</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">168</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">180</context>
         </context-group>
       </trans-unit><trans-unit id="6ef2ab819d4441fa8bddf6759b6936783d06616f" datatype="html">
         <source>If you disable transcoding, many videos from your users will not work!</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">169</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">181</context>
         </context-group>
       </trans-unit><trans-unit id="a33feadefbb776217c2db96100736314f8b765c2" datatype="html">
         <source>Transcoding threads</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">175</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">187</context>
         </context-group>
       </trans-unit><trans-unit id="5afc7e831e59c325e8fb3e208ec108ff53fb3500" datatype="html">
         <source>Resolution &lt;x id="INTERPOLATION" equiv-text="{{resolution}}"/&gt; enabled</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">191</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">203</context>
         </context-group>
       </trans-unit><trans-unit id="f86acfe567b75b7ea85af6f1cb3efb88085dfb9a" datatype="html">
         <source>
@@ -1111,44 +1137,44 @@ Check this checkbox, save the configuration and test with a video URL of your in
         &lt;x id="START_TAG_MY-HELP" ctype="x-my-help" equiv-text="&lt;my-help&gt;"/&gt;&lt;x id="CLOSE_TAG_MY-HELP" ctype="x-my-help" equiv-text="&lt;/my-help&gt;"/&gt;
       </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">197</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">209</context>
         </context-group>
       </trans-unit><trans-unit id="d5bf7bea37daff4e018fd11a1b552512e5cb54c0" datatype="html">
         <source>Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">202</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">214</context>
         </context-group>
       </trans-unit><trans-unit id="d00f6c2dcb426440a0a8cd8eec12d094fbfaf6f7" datatype="html">
         <source>Previews cache size</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">207</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">219</context>
         </context-group>
       </trans-unit><trans-unit id="98970cd72e776308a37dc4e84bebbedffc787607" datatype="html">
         <source>Video captions cache size</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">218</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">230</context>
         </context-group>
       </trans-unit><trans-unit id="e3a65df2560e99864bbde695da3a7bdf743a184c" datatype="html">
         <source>Customizations</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">228</context>
+          <context context-type="sourcefile">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="0da9752916950ce6890d897b835c923a71ad9c5c" datatype="html">
         <source>JavaScript</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">231</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">243</context>
         </context-group>
       </trans-unit><trans-unit id="fda2339a6e6ba017ee43b560caf660ed4022333c" datatype="html">
         <source>Write directly JavaScript code.&lt;br /&gt;Example: &lt;pre&gt;console.log(&apos;my instance is amazing&apos;);&lt;/pre&gt;</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">234</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">246</context>
         </context-group>
       </trans-unit><trans-unit id="f133b08d6519081bfb8ef51cff4bf2b3af23dde6" datatype="html">
         <source>
@@ -1167,33 +1193,33 @@ Check this checkbox, save the configuration and test with a video URL of your in
               &lt;/pre&gt;
             </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">250</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">262</context>
         </context-group>
       </trans-unit><trans-unit id="6c44844ebdb7352c433b7734feaa65f01bb594ab" datatype="html">
         <source>Advanced configuration</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">162</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">174</context>
         </context-group>
       </trans-unit><trans-unit id="dad5a5283e4c853c011a0f03d5a52310338bbff8" datatype="html">
         <source>Update configuration</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">277</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">289</context>
         </context-group>
       </trans-unit><trans-unit id="3e459b5c3861d8c80084d21d233b7c8e2edd3cca" datatype="html">
         <source>It seems the configuration is invalid. Please search potential errors in the different tabs.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">278</context>
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.html</context>
+          <context context-type="linenumber">290</context>
         </context-group>
       </trans-unit><trans-unit id="80dbb8ba42b97a9ec035c0ba09f45c07ea07096c" datatype="html">
         <source>
       Users
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/admin.component.ts</context>
+          <context context-type="sourcefile">app/+admin/admin.component.html</context>
           <context context-type="linenumber">3</context>
         </context-group>
       </trans-unit><trans-unit id="0315abd64e35510ed0534f597130ef781aca175a" datatype="html">
@@ -1201,7 +1227,7 @@ Check this checkbox, save the configuration and test with a video URL of your in
       Manage follows
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/admin.component.ts</context>
+          <context context-type="sourcefile">app/+admin/admin.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit><trans-unit id="1c9406213cf05033eda4d3df678217b5eb822315" datatype="html">
@@ -1209,7 +1235,7 @@ Check this checkbox, save the configuration and test with a video URL of your in
       Video abuses
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/admin.component.ts</context>
+          <context context-type="sourcefile">app/+admin/admin.component.html</context>
           <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit><trans-unit id="96ccede058f0022f34230c3adc09e60076b6d037" datatype="html">
@@ -1217,7 +1243,7 @@ Check this checkbox, save the configuration and test with a video URL of your in
       Video blacklist
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/admin.component.ts</context>
+          <context context-type="sourcefile">app/+admin/admin.component.html</context>
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit><trans-unit id="7bea88c54fdccfdc9f687b0ffe9bf6a653d19368" datatype="html">
@@ -1225,7 +1251,7 @@ Check this checkbox, save the configuration and test with a video URL of your in
       Jobs
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/admin.component.ts</context>
+          <context context-type="sourcefile">app/+admin/admin.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="9c6ce37623b626a102002901ca12c37e7a3a7f13" datatype="html">
@@ -1233,13 +1259,13 @@ Check this checkbox, save the configuration and test with a video URL of your in
       Configuration
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/admin.component.ts</context>
+          <context context-type="sourcefile">app/+admin/admin.component.html</context>
           <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit><trans-unit id="4e8635c108375983b42229df44bda8c0af84f396" datatype="html">
         <source>1 host (without &quot;http://&quot;) per line</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/following-add/following-add.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/following-add/following-add.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit><trans-unit id="f7a7a00999ccbd126cbb8e74f5dd1724942dd507" datatype="html">
@@ -1247,185 +1273,193 @@ Check this checkbox, save the configuration and test with a video URL of your in
     It seems that you are not on a HTTPS server. Your webserver needs to have TLS activated in order to follow servers.
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/following-add/following-add.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/following-add/following-add.component.html</context>
           <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit><trans-unit id="456c6383d8e7cd15aadbcdc196d4ae7a70092437" datatype="html">
         <source>Add following</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/following-add/following-add.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/following-add/following-add.component.html</context>
           <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit><trans-unit id="45cc8ca94b5a50842a9a8ef804a5ab089a38ae5c" datatype="html">
         <source>ID</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/following-list/following-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/following-list/following-list.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.html</context>
           <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit><trans-unit id="380e20a1e13d9489c69f6dbea7da19025ab6eb25" datatype="html">
         <source>Score</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit><trans-unit id="fe22ca53e651df951dac25b67c17894b0980f767" datatype="html">
         <source>Host</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/following-list/following-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/following-list/following-list.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit><trans-unit id="873b72903b1858a9cd6c8967521030b4d7d1435b" datatype="html">
         <source>State</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.html</context>
           <context context-type="linenumber">11</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/following-list/following-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/following-list/following-list.component.html</context>
           <context context-type="linenumber">9</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.html</context>
           <context context-type="linenumber">20</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
       </trans-unit><trans-unit id="ff3173170e5b03536dd3b3e1afbae1f55356eb1b" datatype="html">
         <source>Created &lt;x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/&gt;&lt;x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/&gt;</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.html</context>
           <context context-type="linenumber">12</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/following-list/following-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/following-list/following-list.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.html</context>
           <context context-type="linenumber">21</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.html</context>
           <context context-type="linenumber">20</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html</context>
           <context context-type="linenumber">13</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html</context>
           <context context-type="linenumber">16</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
       </trans-unit><trans-unit id="5fccee488a9ea908c16d2ab9dbdaf264f1aac479" datatype="html">
         <source>Manage follows</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/follows/follows.component.ts</context>
+          <context context-type="sourcefile">app/+admin/follows/follows.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit><trans-unit id="a9f2501fcb2ff71f1376c2d2fbbbd49f200e6c8f" datatype="html">
         <source>Jobs list</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit><trans-unit id="f61c6867295f3b53d23557021f2f4e0aa1d0b8fc" datatype="html">
         <source>Type</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="74c8f69ec23f41a429e241126ab4d25b9d12348e" datatype="html">
         <source>Processed on</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.html</context>
           <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit><trans-unit id="4fa08915c99629d38c9da8a08b1985a7f4e38e40" datatype="html">
         <source>Finished on</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/jobs/jobs-list/jobs-list.component.html</context>
           <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit><trans-unit id="31cf824034489eb42f6a388d5980b98b8e1de015" datatype="html">
         <source>Create user</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-create.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-update.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.html</context>
           <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit><trans-unit id="2788d9a67ed2b6f35c85818e6af1871317c57a7e" datatype="html">
         <source>Edit user &lt;x id="INTERPOLATION" equiv-text="{{ username }}"/&gt;</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-create.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-update.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit><trans-unit id="1bd571d8f3981f6043b0df3402cc3d97e0d7ad2a" datatype="html">
         <source>john</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-create.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-update.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit><trans-unit id="bb3542ff8e5defa6d0c773799e5c8fe399605d05" datatype="html">
         <source>mail@example.com</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-create.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">21</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-update.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">21</context>
         </context-group>
       </trans-unit><trans-unit id="c36a66f2107e8da5371ebc9d15c2008dff567f46" datatype="html">
         <source>Role</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-create.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">41</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-update.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">41</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="15f046007e4fca2e8477966745e2ec4e3e81bc3b" datatype="html">
         <source>Video quota</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-create.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-update.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.html</context>
           <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit><trans-unit id="42e3c0e89177ca135974221eaf0e4e836c32e345" datatype="html">
@@ -1434,266 +1468,288 @@ Check this checkbox, save the configuration and test with a video URL of your in
       At most, this user could use ~ &lt;x id="INTERPOLATION" equiv-text="{{ computeQuotaWithTranscoding() | bytes: 0 }}"/&gt;.
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-create.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-edit/user-update.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-edit/user-edit.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit><trans-unit id="5e8b4663c17c337a1f11160c0a683350936faa1f" datatype="html">
         <source>Users list</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit><trans-unit id="08ea8692dc2a7050026df26fc39b22960bde9de5" datatype="html">
         <source>Username &lt;x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/&gt;&lt;x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/&gt;</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.html</context>
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit><trans-unit id="0c7e8870481f1287af6a142f538391d8c16c2408" datatype="html">
         <source>Video abuses list</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit><trans-unit id="4ba250869daa372b54d24fafc0ea934769ee4076" datatype="html">
         <source>Reason</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html</context>
           <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit><trans-unit id="2bf5a31043ff476ca081a4080f3f3f17518dc6f2" datatype="html">
         <source>Reporter</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html</context>
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit><trans-unit id="2d1ea268a6a9f483dbc2cbfe19bf4256a57a6af4" datatype="html">
         <source>Video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html</context>
           <context context-type="linenumber">14</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
       </trans-unit><trans-unit id="c6ab75e099e131d7a4f94e1732e7436d8fc386c7" datatype="html">
         <source>Go to the account</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html</context>
           <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit><trans-unit id="1cb8348c199d03e297d165e262237194f25fe3f5" datatype="html">
         <source>Go to the video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html</context>
           <context context-type="linenumber">28</context>
         </context-group>
       </trans-unit><trans-unit id="00ecde6001106fe7406a34cc3459cc5b88e4aec1" datatype="html">
         <source>Blacklisted videos</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit><trans-unit id="7c02d113e9b7884037834cddecf2a32a5538b35b" datatype="html">
         <source>Name &lt;x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/&gt;&lt;x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/&gt;</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html</context>
           <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit><trans-unit id="cd5ca5da9e2fa21571e9f86a24a5c3b45a3ddc51" datatype="html">
         <source>Views &lt;x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/&gt;&lt;x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/&gt;</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html</context>
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit><trans-unit id="d4717113115ca7106a354a5aac54d1c0126261d9" datatype="html">
         <source>NSFW</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html</context>
           <context context-type="linenumber">14</context>
         </context-group>
       </trans-unit><trans-unit id="8c87d9527af7ff2ada84c911516a9e43a352e401" datatype="html">
         <source>UUID</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html</context>
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit><trans-unit id="86f26b106c67be3c2e98b82766656e5d9da86dff" datatype="html">
         <source>Unblacklist</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="sourcefile">app/+admin/video-blacklist/video-blacklist-list/video-blacklist-list.component.html</context>
           <context context-type="linenumber">30</context>
         </context-group>
       </trans-unit><trans-unit id="efad4be364b8fb5c73cbfcc7acccd542f9d84ad6" datatype="html">
         <source>My settings</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account.component.html</context>
           <context context-type="linenumber">3</context>
         </context-group>
       </trans-unit><trans-unit id="520d68b2c9f7dacaf2a5073716cad9bd328ea7e7" datatype="html">
         <source>My video channels</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit><trans-unit id="d02888c485d3aeab6de628508f4a00312a722894" datatype="html">
         <source>My videos</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
+      </trans-unit><trans-unit id="0bb0c57c6d12635d26996c124248e748b666e5ad" datatype="html">
+        <source>My video imports</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
       </trans-unit><trans-unit id="9518d3fb042d551167c1701ddeb88a1374cf1e48" datatype="html">
         <source>Video quota:</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-settings.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-settings.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit><trans-unit id="994363f08f9fbfa3b3994ff7b35c6904fdff18d8" datatype="html">
         <source>Profile</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-settings.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-settings.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit><trans-unit id="b5398623f87ee72ed23f5023918db1707771e925" datatype="html">
         <source>Video settings</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-settings.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-settings.component.html</context>
           <context context-type="linenumber">15</context>
         </context-group>
+      </trans-unit><trans-unit id="c74e3202d080780c6415d0e9209c1c859438b735" datatype="html">
+        <source>Danger zone</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-settings.component.html</context>
+          <context context-type="linenumber">18</context>
+        </context-group>
       </trans-unit><trans-unit id="8057bddbed23d6cd911df8cc3a4ec24d1f258b79" datatype="html">
         <source>&lt;x id="INTERPOLATION" equiv-text="{{ video.createdAt | myFromNow }}"/&gt; - &lt;x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7" datatype="html">
         <source>Delete</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.html</context>
           <context context-type="linenumber">32</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">154</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">111</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment.component.html</context>
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit><trans-unit id="73c1cefc348a6f361497210dea1ed79499fd1260" datatype="html">
         <source>Create another video channel</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channels.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channels.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit><trans-unit id="30fcac6c20aac1f24e000efc4a889cbb93d4baf2" datatype="html">
         <source>Go to the channel</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channels.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channels.component.html</context>
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit><trans-unit id="9dbe4718a5611fbc611fc6b5e0b27df813372c68" datatype="html">
         <source>Create a video channel</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
           <context context-type="linenumber">6</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
           <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit><trans-unit id="bc155f9fc3be3f32083f19b2c77d4ad3b696d9b9" datatype="html">
         <source>Display name</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
           <context context-type="linenumber">12</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
           <context context-type="linenumber">12</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html</context>
           <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit><trans-unit id="74728de5289ea2ff3f553bc2b48f1811680b931a" datatype="html">
         <source>Short text to tell people how they can support your channel (membership platform...).&lt;br /&gt;&lt;br /&gt;
 When you will upload a video in this channel, the video support field will be automatically filled by this text.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-create.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
           <context context-type="linenumber">36</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-update.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-video-channels/my-account-video-channel-edit.component.html</context>
           <context context-type="linenumber">36</context>
         </context-group>
+      </trans-unit><trans-unit id="38baeb215c17af9d9e295e371a57f4a48ab4c191" datatype="html">
+        <source>Target</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-video-imports/my-account-video-imports.component.html</context>
+          <context context-type="linenumber">8</context>
+        </context-group>
       </trans-unit><trans-unit id="739516c2ca75843d5aec9cf0e6b3e4335c4227b9" datatype="html">
         <source>Change password</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="e70e209561583f360b1e9cefd2cbb1fe434b6229" datatype="html">
         <source>New password</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit><trans-unit id="ede41f01c781b168a783cfcefc6fb67d48780d9b" datatype="html">
         <source>Confirm new password</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html</context>
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit><trans-unit id="20f62f24170d57b1efeb2387a0949f482cd4d129" datatype="html">
         <source>Default policy on videos containing sensitive content</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
           <context context-type="linenumber">3</context>
         </context-group>
       </trans-unit><trans-unit id="fb17c44abac2d1ed2a54cdd28bae289dc0b9a1c2" datatype="html">
         <source>Automatically plays video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
           <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit><trans-unit id="52c9a103b812f258bcddc3d90a6e3f46871d25fe" datatype="html">
         <source>Save</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.html</context>
           <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit><trans-unit id="d2fa66a905b6b7f691c83be681d18188cbe4a8ba" datatype="html">
         <source>Update my profile</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.html</context>
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit><trans-unit id="4b50f2ef2e8b9a24e674d12012ee310f378a5503" datatype="html">
         <source>&lt;x id="INTERPOLATION" equiv-text="{{ actor.followersCount }}"/&gt; subscribers</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/shared/actor-avatar-info.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/shared/actor-avatar-info.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit><trans-unit id="c4a959fc6349bd0793e1ad571d492052a07bdab5" datatype="html">
         <source>Change the avatar</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/shared/actor-avatar-info.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/shared/actor-avatar-info.component.html</context>
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit><trans-unit id="c860c88df9ad58b1187084251340b232cdf0a7f9" datatype="html">
         <source>(extensions: &lt;x id="INTERPOLATION" equiv-text="{{ avatarExtensions }}"/&gt;, max size: &lt;x id="INTERPOLATION_1" equiv-text="{{ maxAvatarSize | bytes }}"/&gt;)</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+my-account/shared/actor-avatar-info.component.ts</context>
+          <context context-type="sourcefile">app/+my-account/shared/actor-avatar-info.component.html</context>
           <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit><trans-unit id="e242e3e8608a3c4a944327eb3d5c221dc6e4e3cd" datatype="html">
@@ -1701,97 +1757,199 @@ When you will upload a video in this channel, the video support field will be au
   Sorry, but we couldn&apos;t find the page you were looking for.
 </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+page-not-found/page-not-found.component.ts</context>
+          <context context-type="sourcefile">app/+page-not-found/page-not-found.component.html</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit><trans-unit id="c65641c36859c328928e6b0f14c3f913886f8add" datatype="html">
         <source>Created by &lt;x id="INTERPOLATION" equiv-text="{{ videoChannel.ownerBy }}"/&gt;</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+video-channels/video-channels.component.ts</context>
+          <context context-type="sourcefile">app/+video-channels/video-channels.component.html</context>
           <context context-type="linenumber">14</context>
         </context-group>
       </trans-unit><trans-unit id="e006ed166ce188cab168e1ca90435b33d042d913" datatype="html">
         <source>Go the owner account page</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+video-channels/video-channels.component.ts</context>
+          <context context-type="sourcefile">app/+video-channels/video-channels.component.html</context>
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit><trans-unit id="1380539d91f77f565de6e21ce210da891e6644b8" datatype="html">
         <source>Support this channel</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+video-channels/video-channel-about/video-channel-about.component.ts</context>
+          <context context-type="sourcefile">app/+video-channels/video-channel-about/video-channel-about.component.html</context>
           <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit><trans-unit id="5523952d0300c96cfba2ec5a693c95f923e90c40" datatype="html">
         <source>Created &lt;x id="INTERPOLATION" equiv-text="{{ videoChannel.createdAt | date }}"/&gt;</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/+video-channels/video-channel-about/video-channel-about.component.ts</context>
+          <context context-type="sourcefile">app/+video-channels/video-channel-about/video-channel-about.component.html</context>
           <context context-type="linenumber">17</context>
         </context-group>
-      </trans-unit><trans-unit id="d4dcf74163f127ca9afa84d55b5d95846958faa0" datatype="html">
-        <source>Upload your video</source>
+      </trans-unit><trans-unit id="801b98c6f02fe3b32f6afa3ee854c99ed83474e6" datatype="html">
+        <source>URL</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add.component.ts</context>
-          <context context-type="linenumber">3</context>
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
+          <context context-type="linenumber">6</context>
         </context-group>
-      </trans-unit><trans-unit id="1af3dcf5aad5b7f4b3251da88a89dc9a184445dd" datatype="html">
-        <source>Upload &lt;x id="INTERPOLATION" equiv-text="{{ videoFileName }}"/&gt;</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add.component.ts</context>
-          <context context-type="linenumber">4</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.html</context>
+          <context context-type="linenumber">12</context>
         </context-group>
-      </trans-unit><trans-unit id="21add64f0f3ebbedf1150ca822c6e149494ab7a9" datatype="html">
-        <source>Select the file to upload</source>
+      </trans-unit><trans-unit id="bfe7f34fbd4c3afa5f84a5580e0fae942cad2333" datatype="html">
+        <source>You can import any URL &lt;a href=&apos;https://rg3.github.io/youtube-dl/supportedsites.html&apos; target=&apos;_blank&apos; rel=&apos;noopener noreferrer&apos;&gt;supported by youtube-dl&lt;/a&gt; or URL that points to a raw MP4 file. You should make sure you have diffusion rights over the content it points to, otherwise it could cause legal trouble to yourself and your instance.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add.component.ts</context>
-          <context context-type="linenumber">12</context>
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
+          <context context-type="linenumber">9</context>
         </context-group>
       </trans-unit><trans-unit id="0cc554f4d7bb6a87515d2d95438e183b50702071" datatype="html">
         <source>Channel</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add.component.ts</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-upload.component.html</context>
+          <context context-type="linenumber">12</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit><trans-unit id="3c78b53bca33467190c0b7a01320bc093a2b1427" datatype="html">
         <source>Privacy</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add.component.ts</context>
-          <context context-type="linenumber">27</context>
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-upload.component.html</context>
+          <context context-type="linenumber">21</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">86</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">139</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">143</context>
+        </context-group>
+      </trans-unit><trans-unit id="63d6bf87c9f30441175648dfd3ef6a19292287c2" datatype="html">
+        <source>
+  Congratulations, the video behind &lt;x id="INTERPOLATION" equiv-text="{{ targetUrl }}"/&gt; will be imported! You can already add information about this video.
+</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
+          <context context-type="linenumber">40</context>
+        </context-group>
+      </trans-unit><trans-unit id="047f50bc5b5d17b5bec0196355953e1a5c590ddb" datatype="html">
+        <source>Update</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-url.component.html</context>
+          <context context-type="linenumber">57</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
+          <context context-type="linenumber">65</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-update.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">105</context>
+        </context-group>
+      </trans-unit><trans-unit id="21add64f0f3ebbedf1150ca822c6e149494ab7a9" datatype="html">
+        <source>Select the file to upload</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-upload.component.html</context>
+          <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit><trans-unit id="f7ac2376749c7985f94f0fc89ba75ea624de1215" datatype="html">
         <source>Publish will be available when upload is finished</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add.component.ts</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-upload.component.html</context>
+          <context context-type="linenumber">48</context>
         </context-group>
       </trans-unit><trans-unit id="223aae0477f79f0bc4436c1c57619415f04cbbb3" datatype="html">
         <source>Publish</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-add.component.ts</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-upload.component.html</context>
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit><trans-unit id="2fcbf437e001f47974d45bd03a19e0d9245fdb3b" datatype="html">
+        <source>Select the torrent to import</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit><trans-unit id="0d6558176587662e9bb3b79cca57d42591cf82f9" datatype="html">
+        <source>Paste magnet URI</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit><trans-unit id="1ce18c12c809a738f05f2290f46df0677f27ed70" datatype="html">
+        <source>You can import any torrent file that points to a mp4 file. You should make sure you have diffusion rights over the content it points to, otherwise it could cause legal trouble to yourself and your instance.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit><trans-unit id="7cb3731472edd9edf6a6d036498c2c8388157266" datatype="html">
+        <source>
+  Congratulations, the video will be imported with BitTorrent! You can already add information about this video.
+</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-import-torrent.component.html</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
+      </trans-unit><trans-unit id="0b60d939cf0f1af9fe513f31164d198abf671860" datatype="html">
+        <source>Import &lt;x id="INTERPOLATION" equiv-text="{{ videoName }}"/&gt;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add.component.html</context>
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit><trans-unit id="e9cfe8bd050660077212af5c02f5be24821f28d5" datatype="html">
+        <source>Upload &lt;x id="INTERPOLATION" equiv-text="{{ videoName }}"/&gt;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add.component.html</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit><trans-unit id="4faf57baebf0fb754a91af0c39521a30cbb1def3" datatype="html">
+        <source>Upload a file</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add.component.html</context>
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit><trans-unit id="fc865859d33eab6fa0a8015233e4686cd544d470" datatype="html">
+        <source>Import with URL</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add.component.html</context>
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit><trans-unit id="752c401d7dcd708944eef60e411187f71d882340" datatype="html">
+        <source>Import with torrent</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/video-add.component.html</context>
+          <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit><trans-unit id="40fa23fe45af4ee2e72cdd3cc6bf6013f180aab0" datatype="html">
         <source>Add caption</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit><trans-unit id="6bad752cfcac8f3572bdf2c619daec683d56d1a8" datatype="html">
         <source>Select the caption file</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.html</context>
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit><trans-unit id="a40a8a9f8359eda00c6a79809e9499100fde3ffd" datatype="html">
@@ -1799,151 +1957,151 @@ When you will upload a video in this channel, the video support field will be au
           This will replace an existing caption!
         </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.html</context>
           <context context-type="linenumber">30</context>
         </context-group>
       </trans-unit><trans-unit id="39702b643cfe3d5b96a4587c1b44a29fa665406c" datatype="html">
         <source>Add this caption</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.html</context>
           <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit><trans-unit id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e" datatype="html">
         <source>Title</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit><trans-unit id="cafc87479686947e2590b9f588a88040aeaf660b" datatype="html">
         <source>Tags</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">15</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">171</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">175</context>
         </context-group>
       </trans-unit><trans-unit id="935e7146fe6c12169abfda18536c5856935cfd82" datatype="html">
         <source>(press Enter to add)</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit><trans-unit id="50f53834157770b8205ada0e7a6e235211e4765e" datatype="html">
         <source>Video descriptions are truncated by default and require manual action to expand them.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit><trans-unit id="d69f4fafc780cc7dbafb063ca5f11e6f7c91b0c5" datatype="html">
         <source>Schedule publication (&lt;x id="INTERPOLATION" equiv-text="{{ calendarTimezone }}"/&gt;)</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">101</context>
         </context-group>
       </trans-unit><trans-unit id="5ef7108218e096d09f4ee8525a05a8c90d7b95ee" datatype="html">
         <source>This video contains mature or explicit content</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">115</context>
         </context-group>
       </trans-unit><trans-unit id="9daabdcaa2bbd83597099b10db22d056cf491644" datatype="html">
         <source>Some instances do not list videos containing mature or explicit content by default.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">116</context>
         </context-group>
       </trans-unit><trans-unit id="3549ee96125a43181f80712ed744ee223a0e645a" datatype="html">
         <source>Enable video comments</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">121</context>
         </context-group>
       </trans-unit><trans-unit id="7e549f41b715552ffe69b85c14a690d9d81c85f0" datatype="html">
         <source>Wait transcoding before publishing the video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit><trans-unit id="24f468ce1148a096477d8dd0d00f0d1fd88d6c63" datatype="html">
         <source>If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">127</context>
         </context-group>
       </trans-unit><trans-unit id="c7742322b1d3dbc921362058d1747c7ec2adbec7" datatype="html">
         <source>Basic info</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">4</context>
         </context-group>
       </trans-unit><trans-unit id="92bcfd1d237a2bfe48dc9f46d074ed26abc8df22" datatype="html">
         <source>Add another caption</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">139</context>
         </context-group>
       </trans-unit><trans-unit id="a46a7503167b77b3ec4e28274a3d1dda637617ed" datatype="html">
         <source>See the subtitle file</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">148</context>
         </context-group>
       </trans-unit><trans-unit id="308a79679d012938a625e41fdd4b804fe42b57b9" datatype="html">
         <source>Cancel create</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">162</context>
         </context-group>
       </trans-unit><trans-unit id="88395fc0137e46a9853cf16762bf5a87687d0d0c" datatype="html">
         <source>Cancel deletion</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">170</context>
         </context-group>
       </trans-unit><trans-unit id="0c720e0dd9e6c60095f961cb714f47e8c0090f93" datatype="html">
         <source>Captions</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">133</context>
         </context-group>
       </trans-unit><trans-unit id="1dd793abd1cb8d16a7a2cb71ca5549a7111ee513" datatype="html">
         <source>Upload thumbnail</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit><trans-unit id="9df3f57e251c077bef7e7da81677cb971c55b639" datatype="html">
         <source>Upload preview</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">193</context>
         </context-group>
       </trans-unit><trans-unit id="b5629d298ff1a69b8db19a4ba2995c76b52da604" datatype="html">
         <source>Support</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">199</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-support.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-support.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">67</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit><trans-unit id="f61f989de6fc12f99369a90800e4b5462d3f10a0" datatype="html">
         <source>Short text to tell people how they can support you (membership platform...).</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">200</context>
         </context-group>
       </trans-unit><trans-unit id="d91da0abc638c05e52adea253d0813f3584da4b1" datatype="html">
         <source>Advanced settings</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">182</context>
         </context-group>
       </trans-unit><trans-unit id="2335f0bd17c63d835b50cfbbcea6c459cb1314c0" datatype="html">
@@ -1951,63 +2109,53 @@ When you will upload a video in this channel, the video support field will be au
     Update &lt;x id="INTERPOLATION" equiv-text="{{ video?.name }}"/&gt;
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-update.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-edit/video-update.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
-      </trans-unit><trans-unit id="047f50bc5b5d17b5bec0196355953e1a5c590ddb" datatype="html">
-        <source>Update</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/video-update.component.ts</context>
-          <context context-type="linenumber">17</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">101</context>
-        </context-group>
       </trans-unit><trans-unit id="9aafb2a928664aa7a9375fd37c533f0375f8b611" datatype="html">
         <source>Download video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit><trans-unit id="8d6a41c2703bed3edfc76e1df0b1ca203404c17c" datatype="html">
         <source>Direct download</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.html</context>
           <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit><trans-unit id="ac3a02ecd20f41278f1ef7c03f45c1117b4b796d" datatype="html">
         <source>Torrent (.torrent file)</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.html</context>
           <context context-type="linenumber">25</context>
         </context-group>
       </trans-unit><trans-unit id="2db8d7cf6a3071f4c1519ef2b5e2713d9ff4e87f" datatype="html">
         <source>Torrent (magnet link)</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.html</context>
           <context context-type="linenumber">30</context>
         </context-group>
       </trans-unit><trans-unit id="dc75033a5238fdc4f462212c847a45ba8018a3fd" datatype="html">
         <source>Download</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.html</context>
           <context context-type="linenumber">40</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">87</context>
         </context-group>
       </trans-unit><trans-unit id="11749f4fc0aa1b5e37f38575e4d4e3b1b7e0e96b" datatype="html">
         <source>Report video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-report.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-report.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit><trans-unit id="bb44873ad8d4c5dbad0ac2a6a50e0ceee9119125" datatype="html">
         <source>Reason...</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-report.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-report.component.html</context>
           <context context-type="linenumber">14</context>
         </context-group>
       </trans-unit><trans-unit id="0e6b8229bd65f93bc8040d0fb598967f220740c7" datatype="html">
@@ -2015,35 +2163,29 @@ When you will upload a video in this channel, the video support field will be au
               Cancel
             </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-report.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-report.component.html</context>
           <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit><trans-unit id="71c77bb8cecdf11ec3eead24dd1ba506573fa9cd" datatype="html">
         <source>Submit</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-report.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-report.component.html</context>
           <context context-type="linenumber">27</context>
         </context-group>
       </trans-unit><trans-unit id="0bd8b27f60a1f098a53e06328426d818e3508ff9" datatype="html">
         <source>Share</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.html</context>
           <context context-type="linenumber">7</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">72</context>
-        </context-group>
-      </trans-unit><trans-unit id="801b98c6f02fe3b32f6afa3ee854c99ed83474e6" datatype="html">
-        <source>URL</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.ts</context>
-          <context context-type="linenumber">12</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit><trans-unit id="d3b15c3bf4a7ea38d6002d2d2c4781642d30e79c" datatype="html">
         <source>Embed</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.html</context>
           <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit><trans-unit id="239fe0316cfe91aa6e1e7bf1ef19e3b7772131f8" datatype="html">
@@ -2051,195 +2193,203 @@ When you will upload a video in this channel, the video support field will be au
           The url is not secured (no HTTPS), so the embed video won&apos;t work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites).
         </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.html</context>
           <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit><trans-unit id="e0cfbc8ea680e4527ebf094c035f3342e9146d9f" datatype="html">
         <source>QR-Code</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.html</context>
           <context context-type="linenumber">40</context>
         </context-group>
+      </trans-unit><trans-unit id="7584313e33a66811eb10646627914a01fff0347d" datatype="html">
+        <source>
+    The video is being imported, it will be available when the import is finished.
+  </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
       </trans-unit><trans-unit id="9ed65ae88f6c982bc44d6fed2796e55f47dbf304" datatype="html">
         <source>
     The video is being transcoded, it may not work properly.
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit><trans-unit id="fbc205ea3d06fa8f65973fa3b490ae172f71c087" datatype="html">
         <source>
     This video will be published on &lt;x id="INTERPOLATION" equiv-text="{{ video.scheduledUpdate.updateAt | date: &apos;full&apos; }}"/&gt;
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="643ab402461b1169eebbe2ed790e12a9a83551aa" datatype="html">
         <source>
             &lt;x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/&gt; - &lt;x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views
           </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">26</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">30</context>
         </context-group>
       </trans-unit><trans-unit id="5cb397241041f7ad70997806227bafcdf7eb1b33" datatype="html">
         <source>Go the channel page</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">31</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit><trans-unit id="ccc07df383b7a32be3e2e105faa5488caf261c1c" datatype="html">
         <source>By &lt;x id="INTERPOLATION" equiv-text="{{ video.by }}"/&gt;</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">45</context>
         </context-group>
       </trans-unit><trans-unit id="be73b652c2707f42b5d780d0c7b8fc5ea0b1706c" datatype="html">
         <source>Go to the account page</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">40</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit><trans-unit id="57075c778cf28b81272df4eb17da944366c98e51" datatype="html">
         <source>You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box &lt;strong&gt;@&lt;x id="INTERPOLATION" equiv-text="{{video.account.name}}"/&gt;@&lt;x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/&gt;&lt;/strong&gt; and subscribe there. Subscription as a PeerTube user is being worked on in &lt;a href=&apos;https://github.com/Chocobozzz/PeerTube/issues/470&apos;&gt;#470&lt;/a&gt;.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">45</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">49</context>
         </context-group>
       </trans-unit><trans-unit id="82b59049f3f89d900c98da9319e156dd513e3ced" datatype="html">
         <source>Like this video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">55</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">59</context>
         </context-group>
       </trans-unit><trans-unit id="623698f075025b2b2fc2e0c59fd95f4f4662a509" datatype="html">
         <source>Dislike this video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">66</context>
         </context-group>
       </trans-unit><trans-unit id="144fff5c40b85414d59e644d8dee7cfefba925a2" datatype="html">
         <source>Download the video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit><trans-unit id="f72992030f134408b675152c397f9d0ec00f3b2a" datatype="html">
         <source>Report</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">89</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">93</context>
         </context-group>
       </trans-unit><trans-unit id="2f4894617d9c44010f87473e583bd4604b7d6ecf" datatype="html">
         <source>Report this video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">92</context>
         </context-group>
       </trans-unit><trans-unit id="007ab5fa2aae8a7372307d3fc45a2dbcb11ffd61" datatype="html">
         <source>Blacklist</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">99</context>
         </context-group>
       </trans-unit><trans-unit id="803c6317abd2dbafcc93226c4e273c62932e3037" datatype="html">
         <source>Blacklist this video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">98</context>
         </context-group>
       </trans-unit><trans-unit id="cd27f761b923a5bdb16ba9844da632edd878f1b1" datatype="html">
         <source>Update this video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">100</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">104</context>
         </context-group>
       </trans-unit><trans-unit id="3dbfdc68f83d91cb360172eb65578cae94e7cbe5" datatype="html">
         <source>Delete this video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">110</context>
         </context-group>
       </trans-unit><trans-unit id="f0c5f6f270e70cbe063b5368fcf48f9afc1abd9b" datatype="html">
         <source>Show more</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit><trans-unit id="5403a767248e304199592271bba3366d2ca3f903" datatype="html">
         <source>Show less</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">132</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit><trans-unit id="7ce8b0d7cc34d4c1ef4a21e990b0a001337bedd1" datatype="html">
         <source>
         Other videos
       </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">183</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">187</context>
         </context-group>
       </trans-unit><trans-unit id="fb779d2b25c4d0ffa7d52c823a240717e8c1fe6c" datatype="html">
         <source>Friendly Reminder:</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">195</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">199</context>
         </context-group>
       </trans-unit><trans-unit id="329900dd14bc4ca33cec3775d25c246e4cde7867" datatype="html">
         <source>
         The sharing system used by this video implies that some technical information about your system (such as a public IP address) can be sent to other peers.
       </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">197</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">201</context>
         </context-group>
       </trans-unit><trans-unit id="e60c11e1b1dfbbeda577364b8de39ded2d796c5e" datatype="html">
         <source>More information</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit><trans-unit id="bd499ca7913bb5408fd139a4cb4f863852d5f318" datatype="html">
         <source>Get more information</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">204</context>
         </context-group>
       </trans-unit><trans-unit id="20fc98888baf65b5ba9fe9622dc036fa8dec6a5f" datatype="html">
         <source>
       OK
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">203</context>
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
+          <context context-type="linenumber">207</context>
         </context-group>
       </trans-unit><trans-unit id="b5f5df598f2d75640849b2a7744f91e5dbd390e7" datatype="html">
         <source>
       Comments
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.html</context>
           <context context-type="linenumber">3</context>
         </context-group>
       </trans-unit><trans-unit id="da8a38f72f92714cf8680560c99982dc651480d5" datatype="html">
         <source>You can either comment on the page of your instance where this video is federated with your PeerTube account, or via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box &lt;strong&gt;@&lt;x id="INTERPOLATION" equiv-text="{{video.account.name}}"/&gt;@&lt;x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/&gt;&lt;/strong&gt; and find back the video. Direct commenting capabilities are being worked on in &lt;a href=&apos;https://github.com/Chocobozzz/PeerTube/issues/224&apos;&gt;#224&lt;/a&gt;.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit><trans-unit id="17810e68b0ba21e62e61eecfaf0a93b2c91033b4" datatype="html">
         <source>No comments.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="69c081796209e45e26af91152ec9bd0a65ec261e" datatype="html">
         <source>View all &lt;x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/&gt; replies</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.html</context>
           <context context-type="linenumber">56</context>
         </context-group>
       </trans-unit><trans-unit id="b7fccd922d6473725247ed85a9fdf96fe6794828" datatype="html">
@@ -2247,13 +2397,13 @@ When you will upload a video in this channel, the video support field will be au
     Comments are disabled.
   </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.html</context>
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit><trans-unit id="db79255cb8757e9e945ba5f901a2b67e4189016e" datatype="html">
         <source>Add comment...</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment-add.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment-add.component.html</context>
           <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit><trans-unit id="26fa50ba8e69b53162b348d98e25f8b76c81343e" datatype="html">
@@ -2261,19 +2411,19 @@ When you will upload a video in this channel, the video support field will be au
       Post comment
     </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment-add.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment-add.component.html</context>
           <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit><trans-unit id="a607fab03e11b0e07c1640e11a1b02d7af06b285" datatype="html">
         <source>Highlighted comment</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment.component.html</context>
           <context context-type="linenumber">5</context>
         </context-group>
       </trans-unit><trans-unit id="cb23d4d98007aa4d7123837f4c17a671848377d6" datatype="html">
         <source>Reply</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment.component.ts</context>
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment.component.html</context>
           <context context-type="linenumber">14</context>
         </context-group>
       </trans-unit>
@@ -2372,6 +2522,10 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-settings.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
@@ -2388,6 +2542,10 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-video-imports/my-account-video-imports.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
@@ -2416,19 +2574,35 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
@@ -2554,6 +2728,10 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-profile/my-account-profile.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
@@ -2602,7 +2780,15 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
         <context-group purpose="location">
@@ -2798,6 +2984,41 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="ca8e8cf0f1686604db3b6a2ebadab7f7b426a047" datatype="html">
+        <source>Are you sure you want to delete your account? This will delete all you data, including channels, videos etc.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e7d5b2de566e4c807c285daf8d8a78b5f7f33311" datatype="html">
+        <source>Type your username to confirm</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9a2f889dde4574a6883c853d1034e75891b28c45" datatype="html">
+        <source>Delete your account</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d8a8a7f7160939fb55e82bc01fe9f876f5f2e065" datatype="html">
+        <source>Delete my account</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8eb8b1a728159f43c31abf76c28ef3ff6c230af7" datatype="html">
+        <source>Your account is deleted.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-danger-zone/my-account-danger-zone.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="db4ff52375f6a25ad0472e92754c8c265ae47c6b" datatype="html">
         <source>Profile updated.</source>
         <context-group purpose="location">
@@ -2925,6 +3146,13 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="289fe8342e8b7df689c75026a24a60fd7f5e9392" datatype="html">
+        <source>To import</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="edeaa933b09690523e46977e11064e9c655d77d7" datatype="html">
         <source>Cannot retrieve OAuth Client credentials: &lt;x id="INTERPOLATION" equiv-text="{{errorText}}"/&gt;.
 </source>
@@ -4048,59 +4276,70 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1e876f14d96cdf3b334c080fe795a2e0ab53aa3a" datatype="html">
-        <source>Your video was uploaded in your account and is private.</source>
+      <trans-unit id="320c9c3482a0ebe46da42ce9e0cbdc5ba26ea8bb" datatype="html">
+        <source>Video to import updated.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-torrent.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-import-url.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0e907e5a96537e464b192f8adce79ce6487cbb1c" datatype="html">
+        <source>Your video was uploaded to your account and is private.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="24840228f2826b66252cfcaab9820b1c7e0da264" datatype="html">
         <source>But associated data (tags, description...) will be lost, are you sure you want to leave this page?</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5af84926d631326e548573ebf0f6dff07845aeb4" datatype="html">
         <source>Your video is not uploaded yet, are you sure you want to leave this page?</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="321e4419a943044e674beb55b8039f42a9761ca5" datatype="html">
         <source>Info</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c5cb19aeb6447deda40cc1227ceca1359ab955e9" datatype="html">
         <source>Upload cancelled</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c55f41189ac6ad3003cce813245f4508284ed0aa" datatype="html">
         <source>We are sorry but PeerTube cannot handle videos &gt; 8GB</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d31d39e8ee9b2f20bffb3468ee062eaa5409c59f" datatype="html">
         <source>Your video quota is exceeded with this video (video size: &lt;x id="INTERPOLATION" equiv-text="{{ videoSize }}"/&gt;, used: &lt;x id="INTERPOLATION_1" equiv-text="{{ videoQuotaUsed }}"/&gt;, quota: &lt;x id="INTERPOLATION_2" equiv-text="{{ videoQuota }}"/&gt;)</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="972fc644f847cf84e4732ec012915c4cdaf865ce" datatype="html">
         <source>Video published.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/video-add.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-add-components/video-upload.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
diff --git a/client/src/locale/source/server_en_US.xml b/client/src/locale/source/server_en_US.xml
index e94a01469..050acacb5 100644
--- a/client/src/locale/source/server_en_US.xml
+++ b/client/src/locale/source/server_en_US.xml
@@ -113,6 +113,30 @@
         <source>Private</source>
         <target>undefined</target>
       </trans-unit>
+      <trans-unit id="Published">
+        <source>Published</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="To transcode">
+        <source>To transcode</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="To import">
+        <source>To import</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Pending">
+        <source>Pending</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Success">
+        <source>Success</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Failed">
+        <source>Failed</source>
+        <target>undefined</target>
+      </trans-unit>
       <trans-unit id="Misc">
         <source>Misc</source>
         <target>undefined</target>