1 files changed, 127 insertions, 19 deletions

diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml
index 76f10f411..592d81a42 100644
--- a/client/src/locale/source/angular_en_US.xml
+++ b/client/src/locale/source/angular_en_US.xml
@@ -40,6 +40,26 @@
           <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation.d.ts</context>
           <context context-type="linenumber">27</context>
         </context-group>
+      </trans-unit><trans-unit id="ngb.datepicker.select-month" datatype="html">
+        <source>Select month</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.d.ts</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.d.ts</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit><trans-unit id="ngb.datepicker.select-year" datatype="html">
+        <source>Select year</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.d.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">../node_modules/@ng-bootstrap/ng-bootstrap/datepicker/datepicker-navigation-select.d.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
       </trans-unit><trans-unit id="ngb.pagination.first" datatype="html">
         <source>««</source>
         <context-group purpose="location">
@@ -210,7 +230,7 @@
         <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.html</context>
-          <context context-type="linenumber">12</context>
+          <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit><trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7" datatype="html">
         <source>Delete</source>
@@ -256,7 +276,7 @@
         <source>Get help</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/misc/help.component.html</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="1fa2c66d97e7cd4a92b80396b2fdc4fe4b6907b2" datatype="html">
         <source>
@@ -1215,7 +1235,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context>
-          <context context-type="linenumber">13</context>
+          <context context-type="linenumber">15</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+video-channels/video-channels.component.html</context>
@@ -1693,6 +1713,12 @@
           <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="1d729bcbe3529d2fe2295b7a3a41282ee09de2c8" datatype="html">
+        <source>Redundancy allowed</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/follows/following-list/following-list.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">
@@ -2158,7 +2184,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context>
-          <context context-type="linenumber">8</context>
+          <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit><trans-unit id="9dbe4718a5611fbc611fc6b5e0b27df813372c68" datatype="html">
         <source>Create a video channel</source>
@@ -2211,11 +2237,17 @@ When you will upload a video in this channel, the video support field will be au
           <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="3a5d57052d13d2da1cbcffdbb8effb9874b1595a" datatype="html">
+        <source>You don&apos;t have any subscriptions yet.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+my-account/my-account-subscriptions/my-account-subscriptions.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/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">18</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+video-channels/video-channels.component.html</context>
@@ -2225,7 +2257,7 @@ When you will upload a video in this channel, the video support field will be au
         <source>Go the owner account page</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+my-account/my-account-subscriptions/my-account-subscriptions.component.html</context>
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">17</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/+video-channels/video-channels.component.html</context>
@@ -2496,6 +2528,12 @@ 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">6</context>
         </context-group>
+      </trans-unit><trans-unit id="5e420747842373fa99a75a7a18df068cc81e46fb" datatype="html">
+        <source>Scheduled</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">25</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">
@@ -2672,18 +2710,44 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
           <context context-type="linenumber">154</context>
         </context-group>
+      </trans-unit><trans-unit id="e687f6387adbaf61ce650b58f0e60ca42d843cee" datatype="html">
+        <source>Already uploaded        ✔</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
+          <context context-type="linenumber">158</context>
+        </context-group>
+      </trans-unit><trans-unit id="ca4588e185413b2fc77dbe35c861cc540b11b9ad" datatype="html">
+        <source>Will be created on update</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
+          <context context-type="linenumber">166</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.html</context>
           <context context-type="linenumber">168</context>
         </context-group>
+      </trans-unit><trans-unit id="b6bfdd386cb0b560d697c93555d8cd8cab00c393" datatype="html">
+        <source>Will be deleted on update</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
+          <context context-type="linenumber">174</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.html</context>
           <context context-type="linenumber">176</context>
         </context-group>
+      </trans-unit><trans-unit id="82f867b2607d45ba36de11d4c8b53d7177122ee0" datatype="html">
+        <source>
+            No captions for now.
+          </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.html</context>
+          <context context-type="linenumber">181</context>
+        </context-group>
       </trans-unit><trans-unit id="0c720e0dd9e6c60095f961cb714f47e8c0090f93" datatype="html">
         <source>Captions</source>
         <context-group purpose="location">
@@ -2746,19 +2810,19 @@ When you will upload a video in this channel, the video support field will be au
         <source>Direct download</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.html</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">27</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.html</context>
-          <context context-type="linenumber">22</context>
+          <context context-type="linenumber">32</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.html</context>
-          <context context-type="linenumber">27</context>
+          <context context-type="linenumber">37</context>
         </context-group>
       </trans-unit><trans-unit id="da44efc7b658c318651866454d258bbbe57ff21c" datatype="html">
         <source>
@@ -2766,13 +2830,13 @@ When you will upload a video in this channel, the video support field will be au
     </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/modal/video-download.component.html</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">43</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.html</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
@@ -3156,6 +3220,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/+admin/follows/shared/redundancy-checkbox.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/jobs/jobs-list/jobs-list.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
@@ -3446,6 +3514,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/+admin/follows/shared/redundancy-checkbox.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/moderation/video-abuse-list/moderation-comment-modal.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
@@ -3566,6 +3638,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/videos/+video-watch/modal/video-download.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">src/app/videos/+video-watch/modal/video-report.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
@@ -3652,6 +3728,27 @@ 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="4d8f527638f3e0b518a96e07d41d886bcce01246" datatype="html">
+        <source>enabled</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/follows/shared/redundancy-checkbox.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="795733aac948794cadeb3be6386882efac2c38ad" datatype="html">
+        <source>disabled</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/follows/shared/redundancy-checkbox.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1123807fc813c816404598147173403d00117557" datatype="html">
+        <source>Redundancy for &lt;x id="INTERPOLATION" equiv-text="{{host}}"/&gt; is &lt;x id="INTERPOLATION_1" equiv-text="{{stateLabel}}"/&gt;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/follows/shared/redundancy-checkbox.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="800cd3cdf47751b576587259ba3a1bc0a7f435b6" datatype="html">
         <source>Comment updated.</source>
         <context-group purpose="location">
@@ -3801,8 +3898,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="9ef88654aab4b2df4fa2083f33caa0c5419c1a60" datatype="html">
-        <source>Do you really want to delete this user?</source>
+      <trans-unit id="ad07d34d4aadfe03c964cec02ca1d3a921e6b603" datatype="html">
+        <source>If you remove this user, you will not be able to create another with the same username!</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/+admin/users/user-list/user-list.component.ts</context>
           <context context-type="linenumber">1</context>
@@ -4066,6 +4163,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="5c0c574151dc8671d9199980ee04bf65aec3b452" datatype="html">
+        <source>Keyboard Shortcuts:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/core/hotkeys/hotkeys.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="247071f6c9233b7e5bc1d8f46795ab6b032f1fbe" datatype="html">
         <source>Incorrect username or password.</source>
         <context-group purpose="location">
@@ -5451,20 +5555,24 @@ 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="fa2601e52cbf5725a13d33fe14458823b882ea50" datatype="html">
-        <source>Video reported.</source>
+      <trans-unit id="ef90545bc832876c0d7f9a10363c75137472bbb5" datatype="html">
+        <source>Copied</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/modal/video-report.component.ts</context>
+          <context context-type="sourcefile">src/app/videos/+video-watch/modal/video-download.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
-      </trans-unit>
-      <trans-unit id="ef90545bc832876c0d7f9a10363c75137472bbb5" datatype="html">
-        <source>Copied</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/videos/+video-watch/modal/video-share.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="fa2601e52cbf5725a13d33fe14458823b882ea50" datatype="html">
+        <source>Video reported.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/videos/+video-watch/modal/video-report.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="aca77c42f255d4bc6e95c12c5d656070726c6c2f" datatype="html">
         <source>Start at &lt;x id="INTERPOLATION" equiv-text="{{timestamp}}"/&gt;</source>
         <context-group purpose="location">