1 files changed, 93 insertions, 68 deletions

diff --git a/client/src/locale/angular.xlf b/client/src/locale/angular.xlf
index 6aa57e8a8..56d4e09e3 100644
--- a/client/src/locale/angular.xlf
+++ b/client/src/locale/angular.xlf
@@ -1335,7 +1335,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">72</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account.component.ts</context>
@@ -2975,8 +2975,8 @@ color: red;
           <context context-type="linenumber">179</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5216455244039448125" datatype="html">
-        <source>VIDEO EDITOR</source>
+      <trans-unit id="5843661880070076970" datatype="html">
+        <source>VIDEO STUDIO</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html</context>
           <context context-type="linenumber">198</context>
@@ -2989,15 +2989,15 @@ color: red;
           <context context-type="linenumber">199,201</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="6675276142886460097" datatype="html">
-        <source>Enable video editor</source>
+      <trans-unit id="252604800845369275" datatype="html">
+        <source>Enable video studio</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html</context>
           <context context-type="linenumber">210</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="1618687984822075464" datatype="html">
-        <source>⚠️ You need to enable transcoding first to enable video editor</source>
+      <trans-unit id="3313548535394806921" datatype="html">
+        <source>⚠️ You need to enable transcoding first to enable video studio</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-vod-transcoding.component.html</context>
           <context context-type="linenumber">213</context>
@@ -6736,25 +6736,32 @@ The link will expire within 1 hour.</source>
           <context context-type="linenumber">47</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="988319118163514570" datatype="html">
+        <source>Video studio edition has finished</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts</context>
+          <context context-type="linenumber">48</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="4579496777570550463" datatype="html">
         <source>Social</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts</context>
-          <context context-type="linenumber">51</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1852164487280647902" datatype="html">
         <source>Your videos</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts</context>
-          <context context-type="linenumber">60</context>
+          <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7844706011418789951" datatype="html">
         <source>Administration</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts</context>
-          <context context-type="linenumber">80</context>
+          <context context-type="linenumber">82</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/menu/menu.component.html</context>
@@ -6765,7 +6772,7 @@ The link will expire within 1 hour.</source>
         <source>Preferences saved</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts</context>
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6721822899525405039" datatype="html">
@@ -7647,13 +7654,17 @@ channel with the same name (<x id="PH_2" equiv-text="videoChannel.name"/>)!</sou
           <context context-type="linenumber">235</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="3742657416068781599" datatype="html">
-        <source>Editor</source>
+      <trans-unit id="6389312883797462351" datatype="html">
+        <source>Studio</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-library/my-videos/my-videos.component.ts</context>
           <context context-type="linenumber">208</context>
         </context-group>
         <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+video-studio/video-studio-routing.module.ts</context>
+          <context context-type="linenumber">14</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts</context>
           <context context-type="linenumber">340</context>
         </context-group>
@@ -7912,6 +7923,10 @@ channel with the same name (<x id="PH_2" equiv-text="videoChannel.name"/>)!</sou
           <context context-type="sourcefile">src/app/+search/search-filters.component.html</context>
           <context context-type="linenumber">229,231</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-forms/reactive-file.component.html</context>
+          <context context-type="linenumber">16,18</context>
+        </context-group>
       </trans-unit>
       <trans-unit id="4540121094340493564" datatype="html">
         <source>Display only</source>
@@ -8625,215 +8640,204 @@ channel with the same name (<x id="PH_2" equiv-text="videoChannel.name"/>)!</sou
           <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="3862497674553063473" datatype="html">
-        <source>Edit <x id="INTERPOLATION" equiv-text="{{ video.name }}"/></source>
+      <trans-unit id="1593265243494758679" datatype="html">
+        <source>Studio for <x id="INTERPOLATION" equiv-text="{{ video.name }}"/></source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5470809226184152498" datatype="html">
         <source>CUT VIDEO</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5639348768609905535" datatype="html">
         <source>Set a new start/end.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit id="783359429228696335" datatype="html">
         <source>New start</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8910806821370505981" datatype="html">
         <source>New end</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">18</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2502254344085150809" datatype="html">
         <source>ADD INTRO</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5030063045826839645" datatype="html">
         <source>Concatenate a file at the beginning of the video.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4798642303989337390" datatype="html">
         <source>Select the intro video file</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">30</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7698413240170540435" datatype="html">
         <source>ADD OUTRO</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">38</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2832051749922509643" datatype="html">
         <source>Concatenate a file at the end of the video.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4368653199478595315" datatype="html">
         <source>Select the outro video file</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">44</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3463158361655332380" datatype="html">
         <source>ADD WATERMARK</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4472450670859114703" datatype="html">
         <source>Add a watermark image to the video.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">54</context>
         </context-group>
       </trans-unit>
       <trans-unit id="155510305759087510" datatype="html">
         <source>Select watermark image file</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">58</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3926035808219061063" datatype="html">
         <source>Run video edition</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">66</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1514792472513458403" datatype="html">
         <source>Video before edition</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">75</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1109043661443571733" datatype="html">
         <source>Edition tasks:</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.html</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.html</context>
           <context context-type="linenumber">80</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3541115907775840269" datatype="html">
         <source>Are you sure you want to edit "<x id="PH" equiv-text="this.video.name"/>"?</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.ts</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.ts</context>
           <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3858880927114551513" datatype="html">
         <source>The current video will be overwritten by this edited video and &lt;strong>you won't be able to recover it&lt;/strong>.&lt;br />&lt;br /></source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.ts</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.ts</context>
           <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4876327655498234453" datatype="html">
         <source>As a reminder, the following tasks will be executed: &lt;ol><x id="PH" equiv-text="listHTML"/>&lt;/ol></source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.ts</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.ts</context>
           <context context-type="linenumber">77</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="8306050839443016954" datatype="html">
-        <source>Video updated.</source>
+      <trans-unit id="7934869554046374009" datatype="html">
+        <source>Edition tasks created.</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.ts</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.ts</context>
           <context context-type="linenumber">90</context>
         </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+videos/+video-edit/video-update.component.ts</context>
-          <context context-type="linenumber">148</context>
-        </context-group>
       </trans-unit>
       <trans-unit id="5609201297201028750" datatype="html">
         <source>(extensions: <x id="PH" equiv-text="this.videoExtensions.join(', ')"/>)</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.ts</context>
-          <context context-type="linenumber">104</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.ts</context>
+          <context context-type="linenumber">106</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.ts</context>
-          <context context-type="linenumber">108</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.ts</context>
+          <context context-type="linenumber">110</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2763845919408843325" datatype="html">
         <source>"<x id="PH" equiv-text="this.getFilename(t.options.file)"/>" will be added at the beginning of the video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.ts</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.ts</context>
+          <context context-type="linenumber">122</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4952096817126306891" datatype="html">
         <source>"<x id="PH" equiv-text="this.getFilename(t.options.file)"/>" will be added at the end of the video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.ts</context>
-          <context context-type="linenumber">124</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.ts</context>
+          <context context-type="linenumber">126</context>
         </context-group>
       </trans-unit>
       <trans-unit id="665518679871959619" datatype="html">
         <source>"<x id="PH" equiv-text="this.getFilename(t.options.file)"/>" image watermark will be added to the video</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.ts</context>
-          <context context-type="linenumber">128</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.ts</context>
+          <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2677581013897190613" datatype="html">
         <source>Video will begin at <x id="PH" equiv-text="secondsToTime(start)"/> and stop at <x id="PH_1" equiv-text="secondsToTime(end)"/></source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.ts</context>
-          <context context-type="linenumber">135</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.ts</context>
+          <context context-type="linenumber">137</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2299077646120636288" datatype="html">
         <source>Video will begin at <x id="PH" equiv-text="secondsToTime(start)"/></source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.ts</context>
-          <context context-type="linenumber">139</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.ts</context>
+          <context context-type="linenumber">141</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7209039243783736285" datatype="html">
         <source>Video will stop at <x id="PH" equiv-text="secondsToTime(end)"/></source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/edit/video-editor-edit.component.ts</context>
-          <context context-type="linenumber">143</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="9127817756370915850" datatype="html">
-        <source>Edit video</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+video-editor/video-editor-routing.module.ts</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="sourcefile">src/app/+video-studio/edit/video-studio-edit.component.ts</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6950140976689343775" datatype="html">
@@ -10112,6 +10116,13 @@ channel with the same name (<x id="PH_2" equiv-text="videoChannel.name"/>)!</sou
           <context context-type="linenumber">86</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="8306050839443016954" datatype="html">
+        <source>Video updated.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+videos/+video-edit/video-update.component.ts</context>
+          <context context-type="linenumber">148</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="1813238393038053050" datatype="html">
         <source>SUPPORT</source>
         <context-group purpose="location">
@@ -13573,18 +13584,25 @@ Ensure you have correctly configured PeerTube (config/ directory), in particular
           <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="80975420989930934" datatype="html">
+        <source>(extensions: <x id="PH" equiv-text="this.videoImageExtensions"/>, <x id="PH_1" equiv-text="this.maxSizeText"/>: <x id="PH_2" equiv-text="this.maxVideoImageSizeInBytes"/>)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-forms/preview-upload.component.ts</context>
+          <context context-type="linenumber">54</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="8728283516316752593" datatype="html">
         <source>This file is too large.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/shared/shared-forms/reactive-file.component.ts</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">54</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6360987759186261451" datatype="html">
         <source>PeerTube cannot handle this kind of file. Accepted extensions are <x id="PH" equiv-text="this.allowedExtensionsMessage"/>}.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/shared/shared-forms/reactive-file.component.ts</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3393133458004181121" datatype="html">
@@ -14337,11 +14355,18 @@ Ensure you have correctly configured PeerTube (config/ directory), in particular
           <context context-type="linenumber">206,207</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="731573110355765429" datatype="html">
+        <source> Your video <x id="START_LINK" ctype="x-a" equiv-text="&lt;a (click)=&quot;markAsRead(notification)&quot; [routerLink]=&quot;notification.videoUrl&quot;>"/><x id="INTERPOLATION" equiv-text="{{ notification.video.name }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> edition has finished </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context>
+          <context context-type="linenumber">213,215</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="5421414445136873229" datatype="html">
         <source> The notification points to content now unavailable </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/shared/shared-main/users/user-notifications.component.html</context>
-          <context context-type="linenumber">213,215</context>
+          <context context-type="linenumber">221,223</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8312101634344200207" datatype="html">