1 files changed, 285 insertions, 46 deletions

diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml
index 592d81a42..a520c4aaf 100644
--- a/client/src/locale/source/angular_en_US.xml
+++ b/client/src/locale/source/angular_en_US.xml
@@ -278,29 +278,84 @@
           <context context-type="sourcefile">app/shared/misc/help.component.html</context>
           <context context-type="linenumber">19</context>
         </context-group>
-      </trans-unit><trans-unit id="1fa2c66d97e7cd4a92b80396b2fdc4fe4b6907b2" datatype="html">
+      </trans-unit><trans-unit id="450025269732888db1f04cfe6033843110ab65ee" datatype="html">
         <source>
-  &lt;x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span&gt;"/&gt;Subscribe&lt;x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span&gt;"/&gt;
-  &lt;x id="START_TAG_SPAN_1" ctype="x-span" equiv-text="&lt;span&gt;"/&gt;
-    &lt;x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount | myNumberFormatter }}"/&gt;
-  &lt;x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span&gt;"/&gt;
-</source>
+    &lt;x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span&gt;"/&gt;
+      Subscribe
+    &lt;x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span&gt;"/&gt;
+    &lt;x id="START_TAG_SPAN_1" ctype="x-span" equiv-text="&lt;span&gt;"/&gt;
+      &lt;x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount | myNumberFormatter }}"/&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/shared/user-subscription/subscribe-button.component.html</context>
-          <context context-type="linenumber">1</context>
+          <context context-type="linenumber">5</context>
         </context-group>
-      </trans-unit><trans-unit id="1cadbf82f0e91611321c5abd282f0c23d8ccbfa1" datatype="html">
-        <source>Subscribed</source>
+      </trans-unit><trans-unit id="c374edf3b9228d3df6d761bdc8a289e7df0096e8" datatype="html">
+        <source>
+    Unsubscribe
+  </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/user-subscription/subscribe-button.component.html</context>
-          <context context-type="linenumber">9</context>
+          <context context-type="linenumber">18</context>
         </context-group>
-      </trans-unit><trans-unit id="3042bd3ad8dffcfeca5fd1ae6159fd1047434e95" datatype="html">
-        <source>Unsubscribe</source>
+      </trans-unit><trans-unit id="fc3a986c4b8fcab2b9be7ed83f07f432e34beb61" datatype="html">
+        <source>Using an ActivityPub-compatible account</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/shared/user-subscription/subscribe-button.component.html</context>
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit><trans-unit id="60251958d9e05c8cc00abf9645bb0026ebbe4dc3" datatype="html">
+        <source>Subscribe with an account on &lt;x id="INTERPOLATION" equiv-text="{{ videoChannel.host }}"/&gt;</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/user-subscription/subscribe-button.component.html</context>
+          <context context-type="linenumber">40</context>
+        </context-group>
+      </trans-unit><trans-unit id="e7adf422424a61b71465d183f9d44bf956482ef0" datatype="html">
+        <source>Subscribe with your local account</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/user-subscription/subscribe-button.component.html</context>
+          <context context-type="linenumber">41</context>
+        </context-group>
+      </trans-unit><trans-unit id="606af655e677f8b06f27f09777cbb8a25b4de665" datatype="html">
+        <source>Subscribe with a remote account:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/user-subscription/subscribe-button.component.html</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit><trans-unit id="d8758664cadd6452256ca25ca0c7259074f427c1" datatype="html">
+        <source>Using a syndication feed</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/user-subscription/subscribe-button.component.html</context>
+          <context context-type="linenumber">49</context>
+        </context-group>
+      </trans-unit><trans-unit id="d5e5bc7d213694fc0414a76f0ff3085bae44268a" datatype="html">
+        <source>Subscribe via RSS</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/user-subscription/subscribe-button.component.html</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit><trans-unit id="4913054c95f5ba14c351ab1b787f7abac97bfdd3" datatype="html">
+        <source>
+    &lt;x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span&gt;"/&gt;Remote subscribe&lt;x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span&gt;"/&gt;
+    &lt;x id="START_TAG_SPAN_1" ctype="x-span" equiv-text="&lt;span&gt;"/&gt;Remote interact&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/shared/user-subscription/remote-subscribe.component.html</context>
           <context context-type="linenumber">10</context>
         </context-group>
+      </trans-unit><trans-unit id="319933e1af77ca2e35b75a5e9270a3c90e83dd4b" datatype="html">
+        <source>You can subscribe to the channel via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the channel URL in the search box and subscribe there.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/user-subscription/remote-subscribe.component.html</context>
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit><trans-unit id="2767d5461b6c622ccdeb868df8becf26bc16b99a" datatype="html">
+        <source>You can interact with this via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type the current URL in the search box and interact with it there.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/user-subscription/remote-subscribe.component.html</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
       </trans-unit><trans-unit id="15f046007e4fca2e8477966745e2ec4e3e81bc3b" datatype="html">
         <source>Video quota</source>
         <context-group purpose="location">
@@ -719,11 +774,17 @@
           <context context-type="sourcefile">app/+video-channels/video-channels.component.html</context>
           <context context-type="linenumber">25</context>
         </context-group>
+      </trans-unit><trans-unit id="4752e5e33da1c3396d3248eb8fef59bca5d00cb3" datatype="html">
+        <source>Show keyboard shortcuts</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/menu/menu.component.html</context>
+          <context context-type="linenumber">91</context>
+        </context-group>
       </trans-unit><trans-unit id="cf75021ac8cb9efd4f95e8880cf52c9acd265768" datatype="html">
         <source>Toggle dark interface</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.html</context>
-          <context context-type="linenumber">91</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit><trans-unit id="8aa58cf00d949c509df91c621ab38131df0a7599" datatype="html">
         <source>Search...</source>
@@ -785,7 +846,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">166</context>
+          <context context-type="linenumber">164</context>
         </context-group>
       </trans-unit><trans-unit id="78d6d3ea26777cd0dad8ddbf9b314151678da46c" datatype="html">
         <source>Licence</source>
@@ -799,7 +860,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">175</context>
+          <context context-type="linenumber">173</context>
         </context-group>
       </trans-unit><trans-unit id="fe46ccaae902ce974e2441abe752399288298619" datatype="html">
         <source>Language</source>
@@ -817,7 +878,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">184</context>
+          <context context-type="linenumber">182</context>
         </context-group>
       </trans-unit><trans-unit id="c8d58c4fbe23e51af3dc8f58cb4a81eac20739e8" datatype="html">
         <source>All of these tags</source>
@@ -1713,6 +1774,26 @@
           <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="7823909fb1d8d313382f6f4bd842f1a7ef6f08d1" datatype="html">
+        <source>Accepted</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.html</context>
+          <context context-type="linenumber">23</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/follows/following-list/following-list.component.html</context>
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit><trans-unit id="e6a27066251ca1e04c5be86ad758380856df2506" datatype="html">
+        <source>Pending</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/follows/followers-list/followers-list.component.html</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/follows/following-list/following-list.component.html</context>
+          <context context-type="linenumber">22</context>
+        </context-group>
       </trans-unit><trans-unit id="1d729bcbe3529d2fe2295b7a3a41282ee09de2c8" datatype="html">
         <source>Redundancy allowed</source>
         <context-group purpose="location">
@@ -2494,7 +2575,7 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">159</context>
         </context-group>
       </trans-unit><trans-unit id="63d6bf87c9f30441175648dfd3ef6a19292287c2" datatype="html">
         <source>
@@ -2642,7 +2723,7 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">193</context>
+          <context context-type="linenumber">191</context>
         </context-group>
       </trans-unit><trans-unit id="457b1cff4d8d7fad0c8742f69c413ecf5e443851" datatype="html">
         <source>Tags could be used to suggest relevant recommendations.&lt;/br&gt;Press Enter to add a new tag.</source>
@@ -2832,6 +2913,10 @@ 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-download.component.html</context>
           <context context-type="linenumber">43</context>
         </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment-add.component.html</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
       </trans-unit><trans-unit id="dc75033a5238fdc4f462212c847a45ba8018a3fd" datatype="html">
         <source>Download</source>
         <context-group purpose="location">
@@ -3032,29 +3117,23 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
           <context context-type="linenumber">133</context>
         </context-group>
-      </trans-unit><trans-unit id="5d5844aea729b7cd8e6e1e0d07c3956f8cb54f89" 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.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">138</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.html</context>
-          <context context-type="linenumber">148</context>
+          <context context-type="linenumber">146</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.html</context>
-          <context context-type="linenumber">154</context>
+          <context context-type="linenumber">152</context>
         </context-group>
       </trans-unit><trans-unit id="4c0ba3cde3b3c58b855ffb4beaa5804a2fc3826b" datatype="html">
         <source>Friendly Reminder: </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.html</context>
-          <context context-type="linenumber">210</context>
+          <context context-type="linenumber">208</context>
         </context-group>
       </trans-unit><trans-unit id="9e66f7507eb263abdbab7abafd825f1dc8bc880b" datatype="html">
         <source>
@@ -3062,19 +3141,19 @@ 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/video-watch.component.html</context>
-          <context context-type="linenumber">211</context>
+          <context context-type="linenumber">209</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.html</context>
-          <context context-type="linenumber">214</context>
+          <context context-type="linenumber">212</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.html</context>
-          <context context-type="linenumber">214</context>
+          <context context-type="linenumber">212</context>
         </context-group>
       </trans-unit><trans-unit id="20fc98888baf65b5ba9fe9622dc036fa8dec6a5f" datatype="html">
         <source>
@@ -3082,7 +3161,7 @@ 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/video-watch.component.html</context>
-          <context context-type="linenumber">217</context>
+          <context context-type="linenumber">215</context>
         </context-group>
       </trans-unit><trans-unit id="abf2b0f7b6405fa2841ca39c827e86089a95cc27" datatype="html">
         <source>
@@ -3110,13 +3189,13 @@ When you will upload a video in this channel, the video support field will be au
         <source>No comments.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.html</context>
-          <context context-type="linenumber">19</context>
+          <context context-type="linenumber">18</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.html</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit><trans-unit id="b7fccd922d6473725247ed85a9fdf96fe6794828" datatype="html">
         <source>
@@ -3124,7 +3203,7 @@ 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/comment/video-comments.component.html</context>
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">64</context>
         </context-group>
       </trans-unit><trans-unit id="db79255cb8757e9e945ba5f901a2b67e4189016e" datatype="html">
         <source>Add comment...</source>
@@ -3138,7 +3217,35 @@ 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/comment/video-comment-add.component.html</context>
-          <context context-type="linenumber">18</context>
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit><trans-unit id="8b2bb53dfb5f059f2b68cc4ac00661a865909135" datatype="html">
+        <source>You are one step away from commenting</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment-add.component.html</context>
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit><trans-unit id="7984a44ce86b961f4f18c9a58c638f5e8f07a225" datatype="html">
+        <source>
+      If you have an account on this instance, you can login:
+    </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment-add.component.html</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit><trans-unit id="afe0ad39fee662489f1033e53aea3e16a7e89228" datatype="html">
+        <source>login to comment</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment-add.component.html</context>
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit><trans-unit id="ebfa03f8d0d2f2a76704fe9a799b0dac8b620f77" datatype="html">
+        <source>
+      Otherwise you can comment using an account on an ActivityPub-compatible instance:
+    </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment-add.component.html</context>
+          <context context-type="linenumber">36</context>
         </context-group>
       </trans-unit><trans-unit id="a607fab03e11b0e07c1640e11a1b02d7af06b285" datatype="html">
         <source>Highlighted comment</source>
@@ -3193,6 +3300,48 @@ 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="d9fc2b03f04056671d7d4ffcac7197189d959cd6" datatype="html">
+        <source>240p</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c8cfad7e7a16c57c42535331b65cb7de40d8402e" datatype="html">
+        <source>360p</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="48f0af5a0d0bea4e84b27eaf41b19c85a531c2a5" datatype="html">
+        <source>480p</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6f06138daf6363746ff26bfc0cb2491c09cdfdf2" datatype="html">
+        <source>720p</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="65c94f9beb6fe957808c40060da280cc7ace7ab9" datatype="html">
+        <source>1080p</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="421a937491f19774d17eefa1d24816dae1a9f111" datatype="html">
+        <source>Auto (via ffmpeg)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="6080b77234e92ad41bb52653b239c4c4f851317d" datatype="html">
         <source>Error</source>
         <context-group purpose="location">
@@ -3665,6 +3814,100 @@ 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="aa6fb95c355f172bda303de1ce2f38c251a149cf" datatype="html">
+        <source>Unlimited</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/users/shared/user.service.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>
+      </trans-unit>
+      <trans-unit id="54adc67482fdaa0d361a2992bc91e064dc61cc9a" datatype="html">
+        <source>100MB</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cd34ef1f476d5422f49f6ed429f61fc1cfcb1174" datatype="html">
+        <source>500MB</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4a47b4beea31cac6e5970b6bc522902f545acc8b" datatype="html">
+        <source>1GB</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b26d0cac75638623098ab7e06e16b096d1f55cc8" datatype="html">
+        <source>5GB</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f9fc4e7ec6743cb6f69bea2d0859a655ed44ffae" datatype="html">
+        <source>20GB</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a56e3f92fe16d97ee4f05051ea61c466ecb51d5e" datatype="html">
+        <source>50GB</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="31dcc0c63f6234ace8caa84ae1abc33d4022122d" datatype="html">
+        <source>10MB</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f2f968b6f2199b919f567702c6f23b43e5ea71af" datatype="html">
+        <source>50MB</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c31575424fe1b2a57064413f3eda7ce657c46c8a" datatype="html">
+        <source>2GB</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+admin/config/shared/config.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="fc5731a28a99b25c62d43333ceebb250d60aff84" datatype="html">
         <source>&lt;x id="INTERPOLATION" equiv-text="{{host}}"/&gt; is not valid</source>
         <context-group purpose="location">
@@ -3813,17 +4056,6 @@ 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="aa6fb95c355f172bda303de1ce2f38c251a149cf" datatype="html">
-        <source>Unlimited</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/+admin/users/shared/user.service.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>
-      </trans-unit>
       <trans-unit id="364463fab6c5714118d6449561a0f8de1cc10bfa" datatype="html">
         <source>User &lt;x id="INTERPOLATION" equiv-text="{{username}}"/&gt; created.</source>
         <context-group purpose="location">
@@ -5397,6 +5629,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="1cadbf82f0e91611321c5abd282f0c23d8ccbfa1" datatype="html">
+        <source>Subscribed</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/user-subscription/subscribe-button.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="58639b3f0be657475928fb49c4a7cbd16aa44ded" datatype="html">
         <source>Subscribed to &lt;x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/&gt;</source>
         <context-group purpose="location">