2 files changed, 121 insertions, 36 deletions

diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml
index d61d4f9f2..3aa178825 100644
--- a/client/src/locale/source/angular_en_US.xml
+++ b/client/src/locale/source/angular_en_US.xml
@@ -1120,45 +1120,45 @@
         <source>Display unlisted and private videos</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">14</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">14</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">14</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">14</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">14</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
-          <context context-type="linenumber">11</context>
+          <context context-type="linenumber">14</context>
         </context-group>
       </trans-unit><trans-unit id="c31161d1661884f54fbc5635aad5ce8d4803897e" datatype="html">
         <source>No results.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">20</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">20</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">20</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">20</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/video-list/video-overview.component.html</context>
@@ -1166,7 +1166,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">20</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.html</context>
@@ -1174,7 +1174,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/video/abstract-video-list.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">20</context>
         </context-group>
       </trans-unit><trans-unit id="2290d09f4f113351baa9152ca8ad14cd03a11ba6" datatype="html">
         <source>
@@ -1266,7 +1266,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/modal/video-blacklist.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">26</context>
         </context-group>
       </trans-unit><trans-unit id="71c77bb8cecdf11ec3eead24dd1ba506573fa9cd" datatype="html">
         <source>Submit</source>
@@ -1288,7 +1288,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/modal/video-blacklist.component.html</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">31</context>
         </context-group>
       </trans-unit><trans-unit id="89e55a86cb300f06139ff398c9c8bb7376f78b07" datatype="html">
         <source>About &lt;x id="INTERPOLATION" equiv-text="{{ instanceName }}"/&gt; instance</source>
@@ -2347,19 +2347,19 @@
         <source>User&apos;s email must be verified to login</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.html</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">72</context>
         </context-group>
       </trans-unit><trans-unit id="79cee9973620b2592ff2824c525aa8ed0b5e2b8b" datatype="html">
         <source>User&apos;s email is verified / User can login without email verification</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.html</context>
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit><trans-unit id="a9587caabf0dc5d824f817baae1c2f5521d9b1ee" datatype="html">
         <source>Ban reason:</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/users/user-list/user-list.component.html</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit><trans-unit id="bb863c794307735652d8695143e116eaee8a3c4f" datatype="html">
         <source>Moderation comment</source>
@@ -2425,7 +2425,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">25</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-ownership/my-account-ownership.component.html</context>
@@ -2439,7 +2439,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit><trans-unit id="e330cbadca2d8639aabf525d5fe7e5b62d324ee2" datatype="html">
         <source>Reason:</source>
@@ -2465,17 +2465,23 @@
           <context context-type="sourcefile">app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context>
           <context context-type="linenumber">9</context>
         </context-group>
+      </trans-unit><trans-unit id="b748c96a1ee98d2fa9a645fb71838f5d4938855b" datatype="html">
+        <source>Unfederated</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context>
+          <context context-type="linenumber">10</context>
+        </context-group>
       </trans-unit><trans-unit id="a7f42da3bb4eea0b71b0a20a2aff6612a82cab99" datatype="html">
         <source>Date &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/moderation/video-blacklist-list/video-blacklist-list.component.html</context>
-          <context context-type="linenumber">10</context>
+          <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit><trans-unit id="7963019b5535b51efa399e6a62b163f3e04d296f" datatype="html">
         <source>Blacklist reason:</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html</context>
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit><trans-unit id="90868353e7e6f5994109ee1011131cefa992116c" datatype="html">
         <source>Moderation</source>
@@ -3089,17 +3095,25 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/videos/+video-edit/video-add-components/video-upload.component.html</context>
           <context context-type="linenumber">25</context>
         </context-group>
+      </trans-unit><trans-unit id="6357683911e256c566259880de43ea9403de00d3" datatype="html">
+        <source>
+  Congratulations! Your video is now available in your private library.
+</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">45</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-components/video-upload.component.html</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">58</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-components/video-upload.component.html</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit><trans-unit id="2fcbf437e001f47974d45bd03a19e0d9245fdb3b" datatype="html">
         <source>Select the torrent to import</source>
@@ -3476,6 +3490,12 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/videos/+video-watch/modal/video-blacklist.component.html</context>
           <context context-type="linenumber">3</context>
         </context-group>
+      </trans-unit><trans-unit id="9849bf6a9e45a9a91d13a419afbb5176f9b2367d" datatype="html">
+        <source>Unfederate the video (ask for its deletion from the remote instances)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-blacklist.component.html</context>
+          <context context-type="linenumber">21</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.
@@ -4091,6 +4111,20 @@ 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="0594812d4c50c2adbd1a892a3497c4e5c19e4b32" datatype="html">
+        <source>yes</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6320692861e01fa9c9d4e692d0d27b6c12b21c3b" datatype="html">
+        <source>no</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="652845b2b32b2e117b9b02879b1af07859b0e223" datatype="html">
         <source>Do you really want to remove this video from the blacklist? It will be available again in the videos list.</source>
         <context-group purpose="location">
@@ -4457,15 +4491,8 @@ 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="d5adc9efad0469fc3e1503d68c4ec2ff4453a814" datatype="html">
-        <source>Do you really want to delete &lt;x id="INTERPOLATION" equiv-text="{{videoChannelName}}"/&gt;? It will delete all videos uploaded in this channel too.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="703dee7f3e693f9c77ef17c46f9fa71999609f8e" datatype="html">
-        <source>Please type the name of the video channel to confirm</source>
+      <trans-unit id="3859ca2a7577ba8797058d7d97eb8054bc56ec99" datatype="html">
+        <source>Please type the display name of the video channel (&lt;x id="INTERPOLATION" equiv-text="{{displayName}}"/&gt;) to confirm</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+my-account/my-account-video-channels/my-account-video-channels.component.ts</context>
           <context context-type="linenumber">1</context>
@@ -5274,8 +5301,8 @@ 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="7de2178ed1036844fb1c3ad8b7899a039fcdcdb9" datatype="html">
-        <source>Report reason cannot be more than 300 characters long.</source>
+      <trans-unit id="8c7d4c82b057aea5dbae811e16935f9bcae4c2aa" datatype="html">
+        <source>Report reason cannot be more than 3000 characters long.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/shared/forms/form-validators/video-abuse-validators.service.ts</context>
           <context context-type="linenumber">1</context>
@@ -5295,8 +5322,8 @@ 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="89d0b662dde0871cf17244e79b2cb62cd517e44f" datatype="html">
-        <source>Moderation comment cannot be more than 300 characters long.</source>
+      <trans-unit id="23c1c2e105a98b0b6728949418a256b026b8971c" datatype="html">
+        <source>Moderation comment cannot be more than 3000 characters long.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/shared/forms/form-validators/video-abuse-validators.service.ts</context>
           <context context-type="linenumber">1</context>
@@ -5505,6 +5532,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="2f5f2093f14679fed82ff76a0cd2a28145a83ca9" datatype="html">
+        <source>PeerTube cannot handle this kind of file. Accepted extensions are &lt;x id="INTERPOLATION" equiv-text="{{extensions}}"/&gt;.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/reactive-file.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="0bf41abaa85526711f7952b4600e4044bc7f04a4" datatype="html">
         <source>All unsaved data will be lost, are you sure you want to leave this page?</source>
         <context-group purpose="location">
@@ -6351,6 +6385,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="bfdf9de4bd9140f77feb6a5fe2b51f3f0565eaa4" datatype="html">
+        <source>You have unsaved changes! If you leave, your changes will be lost.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/+video-edit/video-update.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="757e9c083c8f3d578bd74f055cc337c72417e187" datatype="html">
         <source>Video updated.</source>
         <context-group purpose="location">
@@ -6439,6 +6480,34 @@ 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="5b94148c16fa19e3db89972d11e93f790a73a054" datatype="html">
+        <source>Trending for the last 24 hours</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/video-list/video-trending.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8c429645223c24afe30218fc45bb07e352bb1938" datatype="html">
+        <source>Trending videos are those totalizing the greatest number of views during the last 24 hours.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/video-list/video-trending.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6da9ddede61711ecfeaa94fc61a6b7bb844ab3df" datatype="html">
+        <source>Trending for the last &lt;x id="INTERPOLATION" equiv-text="{{days}}"/&gt; days</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/video-list/video-trending.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="98b98154eca3533e16b81c5b08611d19949e8661" datatype="html">
+        <source>Trending videos are those totalizing the greatest number of views during the last &lt;x id="INTERPOLATION" equiv-text="{{days}}"/&gt; days.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/video-list/video-trending.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="1b157e15c434469d91e56d027b78bf69c9983165" datatype="html">
         <source>Videos from your subscriptions</source>
         <context-group purpose="location">
diff --git a/client/src/locale/source/server_en_US.xml b/client/src/locale/source/server_en_US.xml
index b6e62ce80..f5e125549 100644
--- a/client/src/locale/source/server_en_US.xml
+++ b/client/src/locale/source/server_en_US.xml
@@ -137,6 +137,22 @@
         <source>Failed</source>
         <target>undefined</target>
       </trans-unit>
+      <trans-unit id="This video does not exist.">
+        <source>This video does not exist.</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="We cannot fetch the video. Please try again later.">
+        <source>We cannot fetch the video. Please try again later.</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Sorry">
+        <source>Sorry</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="This video is not available because the remote instance is not responding.">
+        <source>This video is not available because the remote instance is not responding.</source>
+        <target>undefined</target>
+      </trans-unit>
       <trans-unit id="Misc">
         <source>Misc</source>
         <target>undefined</target>