21 files changed, 4672 insertions, 272 deletions
diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html
index 9d14daa4b..7fb2d4f7d 100644
--- a/client/src/app/search/search.component.html
+++ b/client/src/app/search/search.component.html
@@ -1,13 +1,11 @@
 <div myInfiniteScroller [autoLoading]="true" (nearOfBottom)="onNearOfBottom()" class="search-result">
-  <div i18n class="results-header">
+  <div class="results-header">
    <div class="first-line">
-      <div class="results-counter">
+      <div class="results-counter" *ngIf="pagination.totalItems">
-        <ng-container *ngIf="pagination.totalItems">
+        <span i18n>{{ pagination.totalItems | myNumberFormatter }} results</span>
-          {{ pagination.totalItems | myNumberFormatter }} results
+        <span *ngIf="currentSearch" i18n>
-          <span *ngIf="currentSearch">
+          for <span class="search-value">{{ currentSearch }}</span>
-            for <span class="search-value">{{ currentSearch }}</span>
+        </span>
-          </span>
-        </ng-container>
      </div>
      <div
diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml
index 9d113d307..825634a5b 100644
--- a/client/src/locale/source/angular_en_US.xml
+++ b/client/src/locale/source/angular_en_US.xml
@@ -16,7 +16,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.ts</context>
-          <context context-type="linenumber">27</context>
+          <context context-type="linenumber">26</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.ts</context>
+          <context context-type="linenumber">35</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/modal/video-support.component.ts</context>
@@ -28,7 +32,13 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.ts</context>
-          <context context-type="linenumber">40</context>
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit><trans-unit id="1d19634967b06f93fd7f20c0663742f8254e6d46" datatype="html">
+        <source>(extensions: &lt;x id="INTERPOLATION" equiv-text="{{ allowedExtensionsMessage }}"/&gt;, max size: &lt;x id="INTERPOLATION_1" equiv-text="{{ maxFileSize | bytes }}"/&gt;)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/shared/forms/reactive-file.component.ts</context>
+          <context context-type="linenumber">11</context>
        </context-group>
      </trans-unit><trans-unit id="9d5f16f0233b39fa2cd843321407a7358c323ad8" datatype="html">
        <source>&lt;x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/&gt; - &lt;x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views</source>
@@ -36,6 +46,10 @@
          <context context-type="sourcefile">app/shared/video/video-miniature.component.ts</context>
          <context context-type="linenumber">12</context>
        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search.component.ts</context>
+          <context context-type="linenumber">34</context>
+        </context-group>
      </trans-unit><trans-unit id="28f86ffd419b869711aa13f5e5ff54be6d70731c" datatype="html">
        <source>Edit</source>
        <context-group purpose="location">
@@ -58,7 +72,7 @@
        <source>Get help</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/shared/misc/help.component.ts</context>
-          <context context-type="linenumber">17</context>
+          <context context-type="linenumber">18</context>
        </context-group>
      </trans-unit><trans-unit id="12910217fdcdbca64bee06f511639b653d5428ea" datatype="html">
        <source>
@@ -270,6 +284,34 @@
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
          <context context-type="linenumber">86</context>
        </context-group>
+      </trans-unit><trans-unit id="9167c6d3c4c3b74373cf1e90997e4966844ded1a" datatype="html">
+        <source>&lt;x id="INTERPOLATION" equiv-text="{{ pagination.totalItems | myNumberFormatter }}"/&gt; results</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search.component.ts</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit><trans-unit id="4c3960fb1d9b07d1db3b5bda3ee40019211830dc" datatype="html">
+        <source>
+          for &lt;x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span&gt;"/&gt;&lt;x id="INTERPOLATION" equiv-text="{{ currentSearch }}"/&gt;&lt;x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span&gt;"/&gt;
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search.component.ts</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit><trans-unit id="1298c1d2bbbb7415f5494e800f6775fdb70f4df6" datatype="html">
+        <source>Filters</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search.component.ts</context>
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit><trans-unit id="e2dbf0426cbb0b573faf49dffeb7d5bdf16eda5d" datatype="html">
+        <source>
+    No results found
+  </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
      </trans-unit><trans-unit id="aef5c45fb9c725573d20a6283492e6b80fd2ae96" datatype="html">
        <source>Change the language</source>
        <context-group purpose="location">
@@ -386,6 +428,106 @@
          <context context-type="sourcefile">app/header/header.component.ts</context>
          <context context-type="linenumber">9</context>
        </context-group>
+      </trans-unit><trans-unit id="5d43539fc358c3a548b9d487be821db73e2702ff" datatype="html">
+        <source>Sort</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit><trans-unit id="98acac685fc4b2d35e5d0cf3cd224d247a756c3e" datatype="html">
+        <source>Published date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit><trans-unit id="a02ea1d4e7424ca989929da5e598f379940fdbf2" datatype="html">
+        <source>Duration</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit><trans-unit id="dc67060f94f0f2b58549f54a5c07925dffd20238" datatype="html">
+        <source>Display sensitive content</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit><trans-unit id="4f20f2d5a6882190892e58b85f6ccbedfa737952" datatype="html">
+        <source>Yes</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit><trans-unit id="3d3ae7deebc5949b0c1c78b9847886a94321d9fd" datatype="html">
+        <source>No</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit><trans-unit id="607de17c2a755f65775881c19e276e7c933bcf94" datatype="html">
+        <source>Category</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">50</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="linenumber">44</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
+          <context context-type="linenumber">143</context>
+        </context-group>
+      </trans-unit><trans-unit id="78d6d3ea26777cd0dad8ddbf9b314151678da46c" datatype="html">
+        <source>Licence</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">60</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="linenumber">58</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
+          <context context-type="linenumber">152</context>
+        </context-group>
+      </trans-unit><trans-unit id="fe46ccaae902ce974e2441abe752399288298619" datatype="html">
+        <source>Language</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">70</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.ts</context>
+          <context context-type="linenumber">11</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="linenumber">72</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
+          <context context-type="linenumber">161</context>
+        </context-group>
+      </trans-unit><trans-unit id="c8d58c4fbe23e51af3dc8f58cb4a81eac20739e8" datatype="html">
+        <source>All of these tags</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">82</context>
+        </context-group>
+      </trans-unit><trans-unit id="492d2bd18db0cba03f6d9e3b0c42b8639fbe51ab" datatype="html">
+        <source>One of these tags</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit><trans-unit id="5ca707824ab93066c7d9b44e1b8bf216725c2c22" datatype="html">
+        <source>Filter</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">94</context>
+        </context-group>
      </trans-unit><trans-unit id="c31161d1661884f54fbc5635aad5ce8d4803897e" datatype="html">
        <source>No results.</source>
        <context-group purpose="location">
@@ -401,10 +543,6 @@
          <context context-type="linenumber">7</context>
        </context-group>
        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/video-list/video-search.component.ts</context>
-          <context context-type="linenumber">7</context>
-        </context-group>
-        <context-group purpose="location">
          <context context-type="sourcefile">app/+accounts/account-videos/account-videos.component.ts</context>
          <context context-type="linenumber">7</context>
        </context-group>
@@ -854,37 +992,37 @@
        <source>Signup enabled</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">90</context>
        </context-group>
      </trans-unit><trans-unit id="68bda70e0dd4f7f91549462e55f1b2a1602d8402" datatype="html">
        <source>Signup limit</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">96</context>
+          <context context-type="linenumber">94</context>
        </context-group>
      </trans-unit><trans-unit id="ca2283fc765b9f44b69f0175d685dc2443da6011" datatype="html">
        <source>Administrator</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">106</context>
+          <context context-type="linenumber">104</context>
        </context-group>
      </trans-unit><trans-unit id="55a0f51e38679d3141841e8333da5779d349c587" datatype="html">
        <source>Admin email</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">109</context>
+          <context context-type="linenumber">107</context>
        </context-group>
      </trans-unit><trans-unit id="4d13a9cd5ed3dcee0eab22cb25198d43886942be" datatype="html">
        <source>Users</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">119</context>
+          <context context-type="linenumber">117</context>
        </context-group>
      </trans-unit><trans-unit id="31b3275d999af45fe64c6824e6e017d2e2704f09" datatype="html">
        <source>User default video quota</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">122</context>
+          <context context-type="linenumber">120</context>
        </context-group>
      </trans-unit><trans-unit id="50247a2f9711ea9e9a85aacc46668131e9b424a5" datatype="html">
        <source>Basic configuration</source>
@@ -896,25 +1034,25 @@
        <source>Twitter</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">138</context>
+          <context context-type="linenumber">136</context>
        </context-group>
      </trans-unit><trans-unit id="7fdb41bbf2ee042ec5f68725a1c16a1c97f3e524" datatype="html">
        <source>Your Twitter username</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">141</context>
+          <context context-type="linenumber">139</context>
        </context-group>
      </trans-unit><trans-unit id="6e671e839ca889feef0d8ed525d1a44b4b10870c" datatype="html">
        <source>Indicates the Twitter account for the website or platform on which the content was published.</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">144</context>
+          <context context-type="linenumber">142</context>
        </context-group>
      </trans-unit><trans-unit id="c0716c28b9d4c9e0b2fd6031334394214e5f9605" datatype="html">
        <source>Instance whitelisted by Twitter</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">159</context>
+          <context context-type="linenumber">155</context>
        </context-group>
      </trans-unit><trans-unit id="3f008a1a07ca42c6ad258fde1bbd80ed74ada19b" datatype="html">
        <source>If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.&lt;br /&gt;
@@ -922,79 +1060,89 @@ If the instance is not whitelisted, we use an image link card that will redirect
 Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on &lt;a target=&apos;_blank&apos; rel=&apos;noopener noreferrer&apos; href=&apos;https://cards-dev.twitter.com/validator&apos;&gt;https://cards-dev.twitter.com/validator&lt;/a&gt; to see if you instance is whitelisted.</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">162</context>
+          <context context-type="linenumber">156</context>
        </context-group>
      </trans-unit><trans-unit id="419d940613972cc3fae9c8ea0a4306dbf80616e5" datatype="html">
        <source>Services</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">136</context>
+          <context context-type="linenumber">134</context>
        </context-group>
      </trans-unit><trans-unit id="fe22d2c0020e913ee4b75ec22a3abc8814810490" datatype="html">
        <source>Transcoding</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">172</context>
+          <context context-type="linenumber">164</context>
        </context-group>
      </trans-unit><trans-unit id="fca29003c4ea1226ff8cbee89481758aab0e2be9" datatype="html">
        <source>Transcoding enabled</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">178</context>
+          <context context-type="linenumber">168</context>
        </context-group>
      </trans-unit><trans-unit id="6ef2ab819d4441fa8bddf6759b6936783d06616f" datatype="html">
        <source>If you disable transcoding, many videos from your users will not work!</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">180</context>
+          <context context-type="linenumber">169</context>
        </context-group>
      </trans-unit><trans-unit id="a33feadefbb776217c2db96100736314f8b765c2" datatype="html">
        <source>Transcoding threads</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">186</context>
+          <context context-type="linenumber">175</context>
        </context-group>
-      </trans-unit><trans-unit id="6aff7f4b4f140702c4ce791cc9990932623862f0" datatype="html">
+      </trans-unit><trans-unit id="5afc7e831e59c325e8fb3e208ec108ff53fb3500" datatype="html">
-        <source>Resolution &lt;x id="INTERPOLATION" equiv-text="{{ resolution }}"/&gt; enabled</source>
+        <source>Resolution &lt;x id="INTERPOLATION" equiv-text="{{resolution}}"/&gt; enabled</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">205</context>
+          <context context-type="linenumber">191</context>
+        </context-group>
+      </trans-unit><trans-unit id="f86acfe567b75b7ea85af6f1cb3efb88085dfb9a" datatype="html">
+        <source>
+        Cache
+        &lt;x id="START_TAG_MY-HELP" ctype="x-my-help" equiv-text="&lt;my-help&gt;"/&gt;&lt;x id="CLOSE_TAG_MY-HELP" ctype="x-my-help" equiv-text="&lt;/my-help&gt;"/&gt;
+      </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
+          <context context-type="linenumber">197</context>
        </context-group>
-      </trans-unit><trans-unit id="1fa92c6ce274f878b2625587daa7e08b2a3a8b38" datatype="html">
+      </trans-unit><trans-unit id="d5bf7bea37daff4e018fd11a1b552512e5cb54c0" datatype="html">
-        <source>Cache</source>
+        <source>Some files are not federated (previews, captions). We fetch them directly from the origin instance and cache them.</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">209</context>
+          <context context-type="linenumber">202</context>
        </context-group>
      </trans-unit><trans-unit id="d00f6c2dcb426440a0a8cd8eec12d094fbfaf6f7" datatype="html">
        <source>Previews cache size</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">212</context>
+          <context context-type="linenumber">207</context>
        </context-group>
-      </trans-unit><trans-unit id="bf91318659ada3d3ad1b0ca1e63ae427e5a857d5" datatype="html">
+      </trans-unit><trans-unit id="98970cd72e776308a37dc4e84bebbedffc787607" datatype="html">
-        <source>Previews are not federated. We fetch them directly from the origin instance and cache them.</source>
+        <source>Video captions cache size</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">215</context>
+          <context context-type="linenumber">218</context>
        </context-group>
      </trans-unit><trans-unit id="e3a65df2560e99864bbde695da3a7bdf743a184c" datatype="html">
        <source>Customizations</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">227</context>
+          <context context-type="linenumber">228</context>
        </context-group>
      </trans-unit><trans-unit id="0da9752916950ce6890d897b835c923a71ad9c5c" datatype="html">
        <source>JavaScript</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">230</context>
+          <context context-type="linenumber">231</context>
        </context-group>
      </trans-unit><trans-unit id="fda2339a6e6ba017ee43b560caf660ed4022333c" datatype="html">
        <source>Write directly JavaScript code.&lt;br /&gt;Example: &lt;pre&gt;console.log(&apos;my instance is amazing&apos;);&lt;/pre&gt;</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">233</context>
+          <context context-type="linenumber">234</context>
        </context-group>
      </trans-unit><trans-unit id="f133b08d6519081bfb8ef51cff4bf2b3af23dde6" datatype="html">
        <source>
@@ -1014,25 +1162,25 @@ Check this checkbox, save the configuration and test with a video URL of your in
            </source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">249</context>
+          <context context-type="linenumber">250</context>
        </context-group>
      </trans-unit><trans-unit id="6c44844ebdb7352c433b7734feaa65f01bb594ab" datatype="html">
        <source>Advanced configuration</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">170</context>
+          <context context-type="linenumber">162</context>
        </context-group>
      </trans-unit><trans-unit id="dad5a5283e4c853c011a0f03d5a52310338bbff8" datatype="html">
        <source>Update configuration</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">276</context>
+          <context context-type="linenumber">277</context>
        </context-group>
      </trans-unit><trans-unit id="3e459b5c3861d8c80084d21d233b7c8e2edd3cca" datatype="html">
        <source>It seems the configuration is invalid. Please search potential errors in the different tabs.</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
-          <context context-type="linenumber">277</context>
+          <context context-type="linenumber">278</context>
        </context-group>
      </trans-unit><trans-unit id="80dbb8ba42b97a9ec035c0ba09f45c07ea07096c" datatype="html">
        <source>
@@ -1411,17 +1559,21 @@ Check this checkbox, save the configuration and test with a video URL of your in
        <source>&lt;x id="INTERPOLATION" equiv-text="{{ video.createdAt | myFromNow }}"/&gt; - &lt;x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/&gt; views</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.ts</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">19</context>
        </context-group>
      </trans-unit><trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7" datatype="html">
        <source>Delete</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+my-account/my-account-videos/my-account-videos.component.ts</context>
-          <context context-type="linenumber">33</context>
+          <context context-type="linenumber">32</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="linenumber">148</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">101</context>
+          <context context-type="linenumber">106</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment.component.ts</context>
@@ -1506,13 +1658,13 @@ When you will upload a video in this channel, the video support field will be au
        <source>Automatically plays video</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">20</context>
        </context-group>
      </trans-unit><trans-unit id="52c9a103b812f258bcddc3d90a6e3f46871d25fe" datatype="html">
        <source>Save</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/+my-account/my-account-settings/my-account-video-settings/my-account-video-settings.component.ts</context>
-          <context context-type="linenumber">27</context>
+          <context context-type="linenumber">23</context>
        </context-group>
      </trans-unit><trans-unit id="d2fa66a905b6b7f691c83be681d18188cbe4a8ba" datatype="html">
        <source>Update my profile</source>
@@ -1608,6 +1760,10 @@ 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.ts</context>
          <context context-type="linenumber">86</context>
        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
+          <context context-type="linenumber">138</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">
@@ -1620,6 +1776,32 @@ 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.component.ts</context>
          <context context-type="linenumber">61</context>
        </context-group>
+      </trans-unit><trans-unit id="40fa23fe45af4ee2e72cdd3cc6bf6013f180aab0" datatype="html">
+        <source>Add caption</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.ts</context>
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit><trans-unit id="6bad752cfcac8f3572bdf2c619daec683d56d1a8" datatype="html">
+        <source>Select the caption file</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.ts</context>
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit><trans-unit id="a40a8a9f8359eda00c6a79809e9499100fde3ffd" datatype="html">
+        <source>
+          This will replace an existing caption!
+        </source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.ts</context>
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit><trans-unit id="39702b643cfe3d5b96a4587c1b44a29fa665406c" datatype="html">
+        <source>Add this caption</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-caption-add-modal.component.ts</context>
+          <context context-type="linenumber">40</context>
+        </context-group>
      </trans-unit><trans-unit id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e" datatype="html">
        <source>Title</source>
        <context-group purpose="location">
@@ -1632,6 +1814,10 @@ 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.ts</context>
          <context context-type="linenumber">15</context>
        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
+          <context context-type="linenumber">170</context>
+        </context-group>
      </trans-unit><trans-unit id="935e7146fe6c12169abfda18536c5856935cfd82" datatype="html">
        <source>(press Enter to add)</source>
        <context-group purpose="location">
@@ -1644,24 +1830,6 @@ 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.ts</context>
          <context context-type="linenumber">24</context>
        </context-group>
-      </trans-unit><trans-unit id="607de17c2a755f65775881c19e276e7c933bcf94" datatype="html">
-        <source>Category</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">44</context>
-        </context-group>
-      </trans-unit><trans-unit id="78d6d3ea26777cd0dad8ddbf9b314151678da46c" datatype="html">
-        <source>Licence</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">58</context>
-        </context-group>
-      </trans-unit><trans-unit id="fe46ccaae902ce974e2441abe752399288298619" datatype="html">
-        <source>Language</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">72</context>
-        </context-group>
      </trans-unit><trans-unit id="d69f4fafc780cc7dbafb063ca5f11e6f7c91b0c5" datatype="html">
        <source>Schedule publication (&lt;x id="INTERPOLATION" equiv-text="{{ calendarTimezone }}"/&gt;)</source>
        <context-group purpose="location">
@@ -1672,31 +1840,31 @@ When you will upload a video in this channel, the video support field will be au
        <source>This video contains mature or explicit content</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">115</context>
        </context-group>
      </trans-unit><trans-unit id="9daabdcaa2bbd83597099b10db22d056cf491644" datatype="html">
        <source>Some instances do not list videos containing mature or explicit content by default.</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">119</context>
+          <context context-type="linenumber">116</context>
        </context-group>
      </trans-unit><trans-unit id="3549ee96125a43181f80712ed744ee223a0e645a" datatype="html">
        <source>Enable video comments</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">121</context>
        </context-group>
      </trans-unit><trans-unit id="7e549f41b715552ffe69b85c14a690d9d81c85f0" datatype="html">
        <source>Wait transcoding before publishing the video</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">132</context>
+          <context context-type="linenumber">126</context>
        </context-group>
-      </trans-unit><trans-unit id="0001ec53fe3dfd603b7ad80fd32d262170e3d9a5" datatype="html">
+      </trans-unit><trans-unit id="24f468ce1148a096477d8dd0d00f0d1fd88d6c63" datatype="html">
-        <source>If you decide to not wait transcoding before publishing the video, it can be unplayable until it transcoding ends.</source>
+        <source>If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends.</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">135</context>
+          <context context-type="linenumber">127</context>
        </context-group>
      </trans-unit><trans-unit id="c7742322b1d3dbc921362058d1747c7ec2adbec7" datatype="html">
        <source>Basic info</source>
@@ -1704,23 +1872,35 @@ 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.ts</context>
          <context context-type="linenumber">4</context>
        </context-group>
+      </trans-unit><trans-unit id="92bcfd1d237a2bfe48dc9f46d074ed26abc8df22" datatype="html">
+        <source>Add another caption</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="linenumber">139</context>
+        </context-group>
+      </trans-unit><trans-unit id="0c720e0dd9e6c60095f961cb714f47e8c0090f93" datatype="html">
+        <source>Captions</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
+          <context context-type="linenumber">133</context>
+        </context-group>
      </trans-unit><trans-unit id="1dd793abd1cb8d16a7a2cb71ca5549a7111ee513" datatype="html">
        <source>Upload thumbnail</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">146</context>
+          <context context-type="linenumber">163</context>
        </context-group>
      </trans-unit><trans-unit id="9df3f57e251c077bef7e7da81677cb971c55b639" datatype="html">
        <source>Upload preview</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">153</context>
+          <context context-type="linenumber">170</context>
        </context-group>
      </trans-unit><trans-unit id="b5629d298ff1a69b8db19a4ba2995c76b52da604" datatype="html">
        <source>Support</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">159</context>
+          <context context-type="linenumber">176</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/modal/video-support.component.ts</context>
@@ -1728,25 +1908,19 @@ 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.ts</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">66</context>
        </context-group>
      </trans-unit><trans-unit id="f61f989de6fc12f99369a90800e4b5462d3f10a0" datatype="html">
        <source>Short text to tell people how they can support you (membership platform...).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">160</context>
+          <context context-type="linenumber">177</context>
        </context-group>
      </trans-unit><trans-unit id="d91da0abc638c05e52adea253d0813f3584da4b1" datatype="html">
        <source>Advanced settings</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-edit/shared/video-edit.component.ts</context>
-          <context context-type="linenumber">142</context>
+          <context context-type="linenumber">159</context>
-        </context-group>
-      </trans-unit><trans-unit id="c07377d8b52fde03fcf70824a980346b9222d056" datatype="html">
-        <source>(extensions: &lt;x id="INTERPOLATION" equiv-text="{{ videoImageExtensions }}"/&gt;, max size: &lt;x id="INTERPOLATION_1" equiv-text="{{ maxVideoImageSize | bytes }}"/&gt;)</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-edit/shared/video-image.component.ts</context>
-          <context context-type="linenumber">11</context>
        </context-group>
      </trans-unit><trans-unit id="2335f0bd17c63d835b50cfbbcea6c459cb1314c0" datatype="html">
        <source>
@@ -1760,11 +1934,11 @@ When you will upload a video in this channel, the video support field will be au
        <source>Update</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-edit/video-update.component.ts</context>
-          <context context-type="linenumber">16</context>
+          <context context-type="linenumber">17</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">95</context>
+          <context context-type="linenumber">100</context>
        </context-group>
      </trans-unit><trans-unit id="9aafb2a928664aa7a9375fd37c533f0375f8b611" datatype="html">
        <source>Download video</source>
@@ -1798,7 +1972,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.ts</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">82</context>
        </context-group>
      </trans-unit><trans-unit id="11749f4fc0aa1b5e37f38575e4d4e3b1b7e0e96b" datatype="html">
        <source>Report video</source>
@@ -1834,7 +2008,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.ts</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">71</context>
        </context-group>
      </trans-unit><trans-unit id="801b98c6f02fe3b32f6afa3ee854c99ed83474e6" datatype="html">
        <source>URL</source>
@@ -1856,13 +2030,19 @@ 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-share.component.ts</context>
          <context context-type="linenumber">35</context>
        </context-group>
+      </trans-unit><trans-unit id="e0cfbc8ea680e4527ebf094c035f3342e9146d9f" datatype="html">
+        <source>QR-Code</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.ts</context>
+          <context context-type="linenumber">40</context>
+        </context-group>
      </trans-unit><trans-unit id="9ed65ae88f6c982bc44d6fed2796e55f47dbf304" datatype="html">
        <source>
    The video is being transcoded, it may not work properly.
  </source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">6</context>
+          <context context-type="linenumber">11</context>
        </context-group>
      </trans-unit><trans-unit id="fbc205ea3d06fa8f65973fa3b490ae172f71c087" datatype="html">
        <source>
@@ -1870,7 +2050,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.ts</context>
-          <context context-type="linenumber">10</context>
+          <context context-type="linenumber">15</context>
        </context-group>
      </trans-unit><trans-unit id="643ab402461b1169eebbe2ed790e12a9a83551aa" datatype="html">
        <source>
@@ -1878,137 +2058,97 @@ 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.ts</context>
-          <context context-type="linenumber">21</context>
+          <context context-type="linenumber">26</context>
        </context-group>
      </trans-unit><trans-unit id="5cb397241041f7ad70997806227bafcdf7eb1b33" datatype="html">
        <source>Go the channel page</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">26</context>
+          <context context-type="linenumber">31</context>
        </context-group>
      </trans-unit><trans-unit id="57075c778cf28b81272df4eb17da944366c98e51" datatype="html">
        <source>You can subscribe to this account via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box &lt;strong&gt;@&lt;x id="INTERPOLATION" equiv-text="{{video.account.name}}"/&gt;@&lt;x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/&gt;&lt;/strong&gt; and subscribe there. Subscription as a PeerTube user is being worked on in &lt;a href=&apos;https://github.com/Chocobozzz/PeerTube/issues/470&apos;&gt;#470&lt;/a&gt;.</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">32</context>
+          <context context-type="linenumber">37</context>
        </context-group>
      </trans-unit><trans-unit id="ccc07df383b7a32be3e2e105faa5488caf261c1c" datatype="html">
        <source>By &lt;x id="INTERPOLATION" equiv-text="{{ video.by }}"/&gt;</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">37</context>
+          <context context-type="linenumber">42</context>
        </context-group>
      </trans-unit><trans-unit id="be73b652c2707f42b5d780d0c7b8fc5ea0b1706c" datatype="html">
        <source>Go to the account page</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">41</context>
        </context-group>
      </trans-unit><trans-unit id="82b59049f3f89d900c98da9319e156dd513e3ced" datatype="html">
        <source>Like this video</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">54</context>
        </context-group>
      </trans-unit><trans-unit id="623698f075025b2b2fc2e0c59fd95f4f4662a509" datatype="html">
        <source>Dislike this video</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">61</context>
        </context-group>
      </trans-unit><trans-unit id="144fff5c40b85414d59e644d8dee7cfefba925a2" datatype="html">
        <source>Download the video</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">76</context>
+          <context context-type="linenumber">81</context>
        </context-group>
      </trans-unit><trans-unit id="f72992030f134408b675152c397f9d0ec00f3b2a" datatype="html">
        <source>Report</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">83</context>
+          <context context-type="linenumber">88</context>
        </context-group>
      </trans-unit><trans-unit id="2f4894617d9c44010f87473e583bd4604b7d6ecf" datatype="html">
        <source>Report this video</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">82</context>
+          <context context-type="linenumber">87</context>
        </context-group>
      </trans-unit><trans-unit id="007ab5fa2aae8a7372307d3fc45a2dbcb11ffd61" datatype="html">
        <source>Blacklist</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">89</context>
+          <context context-type="linenumber">94</context>
        </context-group>
      </trans-unit><trans-unit id="803c6317abd2dbafcc93226c4e273c62932e3037" datatype="html">
        <source>Blacklist this video</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">88</context>
+          <context context-type="linenumber">93</context>
        </context-group>
      </trans-unit><trans-unit id="cd27f761b923a5bdb16ba9844da632edd878f1b1" datatype="html">
        <source>Update this video</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">99</context>
        </context-group>
      </trans-unit><trans-unit id="3dbfdc68f83d91cb360172eb65578cae94e7cbe5" datatype="html">
        <source>Delete this video</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">100</context>
+          <context context-type="linenumber">105</context>
        </context-group>
      </trans-unit><trans-unit id="f0c5f6f270e70cbe063b5368fcf48f9afc1abd9b" datatype="html">
        <source>Show more</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">120</context>
+          <context context-type="linenumber">125</context>
        </context-group>
      </trans-unit><trans-unit id="5403a767248e304199592271bba3366d2ca3f903" datatype="html">
        <source>Show less</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">131</context>
-        </context-group>
-      </trans-unit><trans-unit id="8057a9b7f9e908ff350edfd71417b96c174e5911" datatype="html">
-        <source>
-            Privacy
-          </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">133</context>
-        </context-group>
-      </trans-unit><trans-unit id="bd407eca607a8905a26a9e30c9d0cd70f4465db8" datatype="html">
-        <source>
-            Category
-          </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">142</context>
-        </context-group>
-      </trans-unit><trans-unit id="af5072bd79ea3cd767ab74a6622d2eee791b3832" datatype="html">
-        <source>
-            Licence
-          </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">151</context>
-        </context-group>
-      </trans-unit><trans-unit id="a911eee019174741b0aec6fcf3fbd5752fab3e67" datatype="html">
-        <source>
-            Language
-          </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">160</context>
-        </context-group>
-      </trans-unit><trans-unit id="ecf7007c2842cc26a7b91d08d48c7a4f5f749fb3" datatype="html">
-        <source>
-            Tags
-          </source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">169</context>
        </context-group>
      </trans-unit><trans-unit id="7ce8b0d7cc34d4c1ef4a21e990b0a001337bedd1" datatype="html">
        <source>
@@ -2016,13 +2156,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/video-watch.component.ts</context>
-          <context context-type="linenumber">183</context>
+          <context context-type="linenumber">182</context>
        </context-group>
      </trans-unit><trans-unit id="fb779d2b25c4d0ffa7d52c823a240717e8c1fe6c" datatype="html">
        <source>Friendly Reminder:</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">195</context>
+          <context context-type="linenumber">194</context>
        </context-group>
      </trans-unit><trans-unit id="329900dd14bc4ca33cec3775d25c246e4cde7867" datatype="html">
        <source>
@@ -2030,19 +2170,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.ts</context>
-          <context context-type="linenumber">197</context>
+          <context context-type="linenumber">196</context>
        </context-group>
      </trans-unit><trans-unit id="e60c11e1b1dfbbeda577364b8de39ded2d796c5e" datatype="html">
        <source>More information</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="linenumber">199</context>
        </context-group>
      </trans-unit><trans-unit id="bd499ca7913bb5408fd139a4cb4f863852d5f318" datatype="html">
        <source>Get more information</source>
        <context-group purpose="location">
          <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">200</context>
+          <context context-type="linenumber">199</context>
        </context-group>
      </trans-unit><trans-unit id="20fc98888baf65b5ba9fe9622dc036fa8dec6a5f" datatype="html">
        <source>
@@ -2050,7 +2190,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.ts</context>
-          <context context-type="linenumber">203</context>
+          <context context-type="linenumber">202</context>
        </context-group>
      </trans-unit><trans-unit id="b5f5df598f2d75640849b2a7744f91e5dbd390e7" datatype="html">
        <source>
@@ -2244,7 +2384,11 @@ When you will upload a video in this channel, the video support field will be au
          <context context-type="linenumber">1</context>
        </context-group>
        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/shared/video-image.component.ts</context>
+          <context context-type="sourcefile">src/app/search/search.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <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>
        <context-group purpose="location">
@@ -2786,8 +2930,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="4fe245955c7ec7d53a4236fda7a985edcb63124c" datatype="html">
+      <trans-unit id="7701e3762dc4a2b2e302c24f17820bc8dd7cacc1" datatype="html">
-        <source>An email with the reset password instructions will be sent to &lt;x id="INTERPOLATION" equiv-text="{{ email }}"/&gt;.</source>
+        <source>An email with the reset password instructions will be sent to &lt;x id="INTERPOLATION" equiv-text="{{email}}"/&gt;.</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/login/login.component.ts</context>
          <context context-type="linenumber">1</context>
@@ -2807,6 +2951,87 @@ 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="7fb1099e29660162f9154d5b2feee7743a423df6" datatype="html">
+        <source>Today</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="02e0243b60007368f87dc01e083f232dd025096d" datatype="html">
+        <source>Last 7 days</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7668986b9f753fcd72ad4a00b1a0c4861d1f7fb8" datatype="html">
+        <source>Last 30 days</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a77b663fd9b94c38bc9c6493a51b5f3acacb9bca" datatype="html">
+        <source>Last 365 days</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d2f3bf121699ff08a25fa4859bfdf3996bf821cc" datatype="html">
+        <source>Short (&lt; 4 min)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ac0fa1039f09ec0d917303658c5bb1ee813a4225" datatype="html">
+        <source>Long (&gt; 10 min)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f24d368d6be0fee70fb4503d2ad37a612e1b0889" datatype="html">
+        <source>Medium (4-10 min)</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ed073fec00d699b7a97bb65b4f3a722b203c5bca" datatype="html">
+        <source>Relevance</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1aee80ab35aa99508802cdec6306e110b2feaf9e" datatype="html">
+        <source>Publish date</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b7641aed03492978b4ec6843b1e53f30464294d9" datatype="html">
+        <source>Views</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/search/search-filters.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7e892ba15f2c6c17e83510e273b3e10fc32ea016" datatype="html">
+        <source>Search</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/search/search.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="b67c8e57904c67c4566610363b7f82c748d04323" datatype="html">
        <source>Instance name is required.</source>
        <context-group purpose="location">
@@ -2849,6 +3074,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="545f5dea553b2d7c4a65920ccdcb1e9dbdc7f4d8" datatype="html">
+        <source>Captions cache size is required.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a8d7131c0ca1eefe7b058e6081236ca1be364e2c" datatype="html">
+        <source>Captions cache size must be greater than 1.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c3decd47b03cf542df091c1a2fb25b756e59074e" datatype="html">
+        <source>Captions cache size must be a number.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/form-validators/custom-config-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="2cdd5a8c604ef16c2f9a17ed81d73f4f9509e828" datatype="html">
        <source>Signup limit is required.</source>
        <context-group purpose="location">
@@ -3069,6 +3315,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="c9eadf8830b3bc09bd444d739af86414eed9bd9e" datatype="html">
+        <source>Video caption language is required.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-captions-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="82083ae96724851ff37e1c7e4e9f907c25677963" datatype="html">
+        <source>Video caption file is required.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/shared/forms/form-validators/video-captions-validators.service.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="fac936be125163a8494f3d7e7f21d65c7e4f1ff6" datatype="html">
        <source>Description cannot be more than 500 characters long.</source>
        <context-group purpose="location">
@@ -3195,6 +3455,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="3b7ed22d0730d03b38c254332829d855ee7256c4" datatype="html">
+        <source>This file is too large.</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">
@@ -3546,13 +3813,6 @@ When you will upload a video in this channel, the video support field will be au
        </context-group>
        <note priority="1" from="description">Month name short</note>
      </trans-unit>
-      <trans-unit id="7fb1099e29660162f9154d5b2feee7743a423df6" datatype="html">
-        <source>Today</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/shared/i18n/i18n-primeng-calendar.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
      <trans-unit id="99ee4faa69cd2ea8e3678c1f557c0ff1f05aae46" datatype="html">
        <source>Clear</source>
        <context-group purpose="location">
@@ -3757,13 +4017,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="6d0fdbf0a14c9ac51e12b52f8781152ba5c87793" datatype="html">
-        <source>This image is too large.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-edit/shared/video-image.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
      <trans-unit id="1e876f14d96cdf3b334c080fe795a2e0ab53aa3a" datatype="html">
        <source>Your video was uploaded in your account and is private.</source>
        <context-group purpose="location">
@@ -3876,13 +4129,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="4a400b174208188dcb46f2c23f4af9accfabaa3f" datatype="html">
-        <source>Cannot fetch video from server, maybe down.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
      <trans-unit id="ed013c2c29216501c688e9cb5f3a1c9fd9147b71" datatype="html">
        <source>This video contains mature or explicit content. Are you sure you want to watch it?</source>
        <context-group purpose="location">
@@ -3897,13 +4143,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="7e892ba15f2c6c17e83510e273b3e10fc32ea016" datatype="html">
-        <source>Search</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/videos/video-list/video-search.component.ts</context>
-          <context context-type="linenumber">1</context>
-        </context-group>
-      </trans-unit>
    </body>
  </file>
 </xliff>
diff --git a/client/src/locale/source/iso639_en_US.xml b/client/src/locale/source/iso639_en_US.xml
index 4bed9617c..7c2a6a6e0 100644
--- a/client/src/locale/source/iso639_en_US.xml
+++ b/client/src/locale/source/iso639_en_US.xml
@@ -41,6 +41,10 @@
        <source>Avaric</source>
        <target>undefined</target>
      </trans-unit>
+      <trans-unit id="Kotava">
+        <source>Kotava</source>
+        <target>undefined</target>
+      </trans-unit>
      <trans-unit id="Aymara">
        <source>Aymara</source>
        <target>undefined</target>
@@ -165,6 +169,10 @@
        <source>English</source>
        <target>undefined</target>
      </trans-unit>
+      <trans-unit id="Esperanto">
+        <source>Esperanto</source>
+        <target>undefined</target>
+      </trans-unit>
      <trans-unit id="Estonian">
        <source>Estonian</source>
        <target>undefined</target>
@@ -309,6 +317,10 @@
        <source>Javanese</source>
        <target>undefined</target>
      </trans-unit>
+      <trans-unit id="Lojban">
+        <source>Lojban</source>
+        <target>undefined</target>
+      </trans-unit>
      <trans-unit id="Japanese">
        <source>Japanese</source>
        <target>undefined</target>
@@ -673,6 +685,10 @@
        <source>Tigrinya</source>
        <target>undefined</target>
      </trans-unit>
+      <trans-unit id="Klingon">
+        <source>Klingon</source>
+        <target>undefined</target>
+      </trans-unit>
      <trans-unit id="Tonga (Tonga Islands)">
        <source>Tonga (Tonga Islands)</source>
        <target>undefined</target>
diff --git a/client/src/locale/source/player_en_US.xml b/client/src/locale/source/player_en_US.xml
index 5bb6afdf7..3666a907d 100644
--- a/client/src/locale/source/player_en_US.xml
+++ b/client/src/locale/source/player_en_US.xml
@@ -345,6 +345,10 @@
        <source>Speed</source>
        <target>undefined</target>
      </trans-unit>
+      <trans-unit id="Subtitles/CC">
+        <source>Subtitles/CC</source>
+        <target>undefined</target>
+      </trans-unit>
      <trans-unit id="peers">
        <source>peers</source>
        <target>undefined</target>
diff --git a/client/src/locale/target/angular_cs_CZ.xml b/client/src/locale/target/angular_cs_CZ.xml
index 4d6ed6486..53a6ca3df 100644
--- a/client/src/locale/target/angular_cs_CZ.xml
+++ b/client/src/locale/target/angular_cs_CZ.xml
@@ -16,7 +16,7 @@
      </trans-unit>
      <trans-unit id="9d5f16f0233b39fa2cd843321407a7358c323ad8">
        <source><x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views</source>
-        <target><x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> shlédnutí</target>
+        <target><x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> zhlédnutí</target>
        <context-group name="null">
          <context context-type="linenumber">12</context>
        </context-group>
@@ -222,7 +222,7 @@
      </trans-unit>
      <trans-unit id="aef5c45fb9c725573d20a6283492e6b80fd2ae96">
        <source>Change the language</source>
-        <target>Vytvořit účet</target>
+        <target>Změnit jazyk</target>
        <context-group name="null">
          <context context-type="linenumber">76</context>
        </context-group>
@@ -533,7 +533,7 @@
      If an IP address is stored in the tracker, it doesn't mean that the person behind the IP (if this person exists) has watched the video
    </source>
        <target>
-      Pokud je IP adresa uložena v trackeru, neznamená to, že osoba za IP adresou (pokud nějaká existuje) opravdu shlédla dané video</target>
+      Pokud je IP adresa uložena v trackeru, neznamená to, že osoba za IP adresou (pokud nějaká existuje) opravdu zhlédla dané video</target>
        <context-group name="null">
          <context context-type="linenumber">47</context>
        </context-group>
@@ -940,7 +940,7 @@ Zakšrtněne tuto možnost, uložte nastavení a vyzkoušejte adresu videa z va�
      </trans-unit>
      <trans-unit id="bf91318659ada3d3ad1b0ca1e63ae427e5a857d5">
        <source>Previews are not federated. We fetch them directly from the origin instance and cache them.</source>
-        <target>Náhledy nejsou federovány. Získáváme je přímo z původní instrance a ukládáme do mezipaměti.</target>
+        <target>Náhledy nejsou federovány. Získáváme je přímo z původní instance a ukládáme do mezipaměti.</target>
        <context-group name="null">
          <context context-type="linenumber">215</context>
        </context-group>
@@ -1108,7 +1108,7 @@ Zakšrtněne tuto možnost, uložte nastavení a vyzkoušejte adresu videa z va�
      </trans-unit>
      <trans-unit id="456c6383d8e7cd15aadbcdc196d4ae7a70092437">
        <source>Add following</source>
-        <target>Přidat k odeběrům</target>
+        <target>Přidat k odběrům</target>
        <context-group name="null">
          <context context-type="linenumber">21</context>
        </context-group>
@@ -1303,7 +1303,7 @@ Zakšrtněne tuto možnost, uložte nastavení a vyzkoušejte adresu videa z va�
      </trans-unit>
      <trans-unit id="cd5ca5da9e2fa21571e9f86a24a5c3b45a3ddc51">
        <source>Views <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></source>
-        <target>Shlednutí <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></target>
+        <target>Zhlednutí <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></target>
        <context-group name="null">
          <context context-type="linenumber">13</context>
        </context-group>
@@ -1394,7 +1394,7 @@ Zakšrtněne tuto možnost, uložte nastavení a vyzkoušejte adresu videa z va�
      </trans-unit>
      <trans-unit id="8057bddbed23d6cd911df8cc3a4ec24d1f258b79">
        <source><x id="INTERPOLATION" equiv-text="{{ video.createdAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views</source>
-        <target><x id="INTERPOLATION" equiv-text="{{ video.createdAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> shlédnutí</target>
+        <target><x id="INTERPOLATION" equiv-text="{{ video.createdAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> zhlédnutí</target>
        <context-group name="null">
          <context context-type="linenumber">20</context>
        </context-group>
@@ -1871,7 +1871,7 @@ When you will upload a video in this channel, the video support field will be au
            <x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views
          </source>
        <target>
-            <x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> shlédnutí
+            <x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> zhlédnutí
          </target>
        <context-group name="null">
          <context context-type="linenumber">21</context>
@@ -2104,7 +2104,7 @@ When you will upload a video in this channel, the video support field will be au
      </trans-unit>
      <trans-unit id="da8a38f72f92714cf8680560c99982dc651480d5">
        <source>You can either comment on the page of your instance where this video is federated with your PeerTube account, or via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box &lt;strong&gt;@<x id="INTERPOLATION" equiv-text="{{video.account.name}}"/>@<x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/>&lt;/strong&gt; and find back the video. Direct commenting capabilities are being worked on in &lt;a href='https://github.com/Chocobozzz/PeerTube/issues/224'&gt;#224&lt;/a&gt;.</source>
-        <target>Můžete komentovat video na stránkách instance, kde je vaše video federováno s PeerTube účtem nebo pomocí kterékoliv instance obsahující ActivityPub federaci. V instantích s Mastodon nebo Pleroma napište do vyhledávacího pole &lt;strong&gt;@<x id="INTERPOLATION" equiv-text="{{video.account.name}}"/>@<x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/>&lt;/strong&gt; a najděte video. Na přímém komentování se pracuje: &lt;a href='https://github.com/Chocobozzz/PeerTube/issues/224'&gt;#224&lt;/a&gt;.</target>
+        <target>Můžete komentovat video na stránkách instance, kde je vaše video federováno s PeerTube účtem nebo pomocí kterékoliv instance obsahující ActivityPub federaci. V instancích s Mastodon nebo Pleroma napište do vyhledávacího pole &lt;strong&gt;@<x id="INTERPOLATION" equiv-text="{{video.account.name}}"/>@<x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/>&lt;/strong&gt; a najděte video. Na přímém komentování se pracuje: &lt;a href='https://github.com/Chocobozzz/PeerTube/issues/224'&gt;#224&lt;/a&gt;.</target>
        <context-group name="null">
          <context context-type="linenumber">8</context>
        </context-group>
diff --git a/client/src/locale/target/angular_de_DE.xml b/client/src/locale/target/angular_de_DE.xml
index e4357b25e..1d1db325d 100644
--- a/client/src/locale/target/angular_de_DE.xml
+++ b/client/src/locale/target/angular_de_DE.xml
@@ -3,6 +3,106 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.1" xmlns:xyz="urn:appInfo:Items" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" version="1.1">
  <file source-language="en-US" datatype="plaintext" original="" target-language="de-DE">
    <body>
+      <trans-unit id="17a9d3860d9ad593dd09a9f934e03999d9e76a7a">
+        <source>
+            Cancel
+          </source>
+        <target>
+            Abbrechen
+          </target>
+        <context-group name="null">
+          <context context-type="linenumber">40</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9d5f16f0233b39fa2cd843321407a7358c323ad8">
+        <source><x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views</source>
+        <target><x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> Aufrufe</target>
+        <context-group name="null">
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
+        <source>Edit</source>
+        <target>Bearbeiten</target>
+        <context-group name="null">
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="961a134583d6256df39fbc520d020ebc48e3128d">
+        <source>Truncated preview</source>
+        <target>Gekürzte Vorschau</target>
+        <context-group name="null">
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f82f53a2544638939a8ba93c0fb1b0a4419c3196">
+        <source>Complete preview</source>
+        <target>Vollständige Vorschau</target>
+        <context-group name="null">
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9c71feb04c2beab559f79c41c6127815fb9c1a6f">
+        <source>Get help</source>
+        <target>Hilfe</target>
+        <context-group name="null">
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="12910217fdcdbca64bee06f511639b653d5428ea">
+        <source>
+    Login
+  </source>
+        <target>
+    Anmelden
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e08a77594f3d89311cdf6da5090044270909c194">
+        <source>User</source>
+        <target>Benutzer</target>
+        <context-group name="null">
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="51ef29329faccb28d94369897068897d1b3d0478">
+        <source>Username or email address</source>
+        <target>Benutzername und E-Mail-Adresse</target>
+        <context-group name="null">
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="02c4360c2d956e74ed6bb1f71e86812af0e19b87">
+        <source>
+          or create an account
+        </source>
+        <target>
+          oder erstelle ein Konto
+        </target>
+        <context-group name="null">
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d6290381021b16febc426d3e3a52dda83991ce0b">
+        <source>
+          or create an account on another instance
+        </source>
+        <target>
+          oder erstelle ein Konto auf einer anderen Instanz
+        </target>
+        <context-group name="null">
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="76e1f485e6ead4c84b606f46d413878881d66ad3">
+        <source>User registration is not allowed on this instance, but you can register on many others!</source>
+        <target>Die Benutzerregistrierung ist hier nicht möglich, dafür auf vielen anderen Instanzen!</target>
+        <context-group name="null">
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="c32ef07f8803a223a83ed17024b38e8d82292407">
        <source>Password</source>
        <target>Passwort</target>
@@ -10,6 +110,20 @@
          <context context-type="linenumber">28</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="b87e81682959464211443afc3e23c506865d2eda">
+        <source>I forgot my password</source>
+        <target>Ich habe mein Passwort vergessen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d2eb6c5d41f70d4b8c0937e7e19e196143b47681">
+        <source>Forgot your password</source>
+        <target>Passwort vergessen</target>
+        <context-group name="null">
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="244aae9346da82b0922506c2d2581373a15641cc">
        <source>Email</source>
        <target>E-Mail</target>
@@ -19,11 +133,50 @@
      </trans-unit>
      <trans-unit id="69b6ac577a19acc39fc0c22342092f327fff2529">
        <source>Email address</source>
-        <target>E-Mail Adresse</target>
+        <target>E-Mail-Adresse</target>
        <context-group name="null">
          <context context-type="linenumber">66</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="78be69e4d26b3b654c49962839d8545e61bf8b55">
+        <source>Send me an email to reset my password</source>
+        <target>Mir eine E-Mail schicken, um mein Passwort zurückzusetzen</target>
+        <context-group name="null">
+          <context context-type="linenumber">77</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2ba14c37f3b23553b2602c5e535d0ff4916f24aa">
+        <source>
+    Reset my password
+  </source>
+        <target>
+    Mein Passwort zurücksetzen
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7f3bdcce4b2e8c37cd7f0f6c92ef8cff34b039b8">
+        <source>Confirm password</source>
+        <target>Passwort bestätigen</target>
+        <context-group name="null">
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3652e5c6e33165264d5271d06cc04ab7123b6df1">
+        <source>Confirmed password</source>
+        <target>Bestätigtes Passwort</target>
+        <context-group name="null">
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8bdf8db5eeeaef83184b489b80c1557b516fb3c3">
+        <source>Reset my password</source>
+        <target>Passwort zurücksetzen</target>
+        <context-group name="null">
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="4499806949402133d08a5029cb5462c5ea25336d">
        <source>
    Create an account
@@ -34,12 +187,21 @@ Konto erstellen</target>
          <context context-type="linenumber">3</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="a6807b834e01ce165aa61fad157b0ff4288b6bf1">
+        <source>Initial video quota:</source>
+        <target>Kontingent für Videos zu Beginn:</target>
+        <context-group name="null">
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="87b6b2c26215c5e712d3bfe4cc86ba53bc23451c">
        <source>
      Unlimited
    </source>
        <target>
-Unbegrenzt</target>
+      Unbegrenzt
+    </target>
        <context-group name="null">
          <context context-type="linenumber">16</context>
        </context-group>
@@ -51,6 +213,13 @@ Unbegrenzt</target>
          <context context-type="linenumber">8</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="717a5e3574fec754fbeb348c2d5561c4d81facc4">
+        <source>Signup</source>
+        <target>Registrieren</target>
+        <context-group name="null">
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="aef5c45fb9c725573d20a6283492e6b80fd2ae96">
        <source>Change the language</source>
        <target>Sprache wechseln</target>
@@ -58,6 +227,17 @@ Unbegrenzt</target>
          <context context-type="linenumber">76</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="b8ccc4f1b3f839fca9bd59e072f715fd487d540f">
+        <source>
+               My public profile
+              </source>
+        <target>
+               Mein öffentliches Profil
+              </target>
+        <context-group name="null">
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="c84b721e9325c9cce20d92f4dbd66898ab5ec947">
        <source>
                My account
@@ -68,6 +248,17 @@ Mein Konto</target>
          <context context-type="linenumber">23</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="ba7378cdaaa60b4fee17a551b232ad3512dac17d">
+        <source>
+                Log out
+              </source>
+        <target>
+                Abmelden
+             </target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="6765b4c916060f6bc42d9bb69e80377dbcb5e4e9">
        <source>Login</source>
        <target>Anmelden</target>
@@ -82,6 +273,13 @@ Mein Konto</target>
          <context context-type="linenumber">37</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="a52dae09be10ca3a65da918533ced3d3f4992238">
+        <source>Videos</source>
+        <target>Videos</target>
+        <context-group name="null">
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="b6b7986bc3721ac483baf20bc9a320529075c807">
        <source>Trending</source>
        <target>Trend</target>
@@ -89,6 +287,27 @@ Mein Konto</target>
          <context context-type="linenumber">45</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="8d20c5f5dd30acbe71316544dab774393fd9c3c1">
+        <source>Recently added</source>
+        <target>Kürzlich hinzugfügt</target>
+        <context-group name="null">
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="eadc17c3df80143992e2d9028dead3199ae6d79d">
+        <source>Local</source>
+        <target>Lokal</target>
+        <context-group name="null">
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b7648e7aced164498aa843b5c4e8f2f1c36a7919">
+        <source>Administration</source>
+        <target>Administration</target>
+        <context-group name="null">
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="004b222ff9ef9dd4771b777950ca1d0e4cd4348a">
        <source>About</source>
        <target>Info</target>
@@ -112,7 +331,7 @@ Mein Konto</target>
      </trans-unit>
      <trans-unit id="c31161d1661884f54fbc5635aad5ce8d4803897e">
        <source>No results.</source>
-        <target>Keine Ergebnisse</target>
+        <target>Keine Ergebnisse.</target>
        <context-group name="null">
          <context context-type="linenumber">7</context>
        </context-group>
@@ -131,5 +350,1165 @@ Mein Konto</target>
          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="5849c589454817c1e991639d3091d8da0e8d6bd2">
+        <source>
+  About <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> instance
+</source>
+        <target>
+  Über die Instanz <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/>
+</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="eec715de352a6b114713b30b640d319fa78207a0">
+        <source>Description</source>
+        <target>Beschreibung</target>
+        <context-group name="null">
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="69580f2c2dbf4edf7096820ba8c393367352d774">
+        <source>Terms</source>
+        <target>Bestimmungen</target>
+        <context-group name="null">
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9c6e6db693ab265457c6578df179c65694141d27">
+        <source>User registration is allowed and</source>
+        <target>Benutzerregistrierung ist möglich und</target>
+        <context-group name="null">
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ac324b07e7c3c972f1c33894eda02dc2917eda5e">
+        <source>
+      this instance provides a baseline quota of <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> space for the videos of its users.
+    </source>
+        <target>
+      diese Instanz stellt für die Videos ihrer Nutzer einen Speicherplatz von <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> zur Verfügung.
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a6865ec6abf6af58f808501d84c8ed6ff8ce46ae">
+        <source>
+      this instance provides unlimited space for the videos of its users.
+    </source>
+        <target>      diese Instanz stellt unbegrenzten Speicherplatz für die Videos ihrer Nutzer zur Verfügung.
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="31b3275d999af45fe64c6824e6e017d2e2704f09">
+        <source>User default video quota</source>
+        <target>Standard-Kontingent für die Videos eines Nutzers</target>
+        <context-group name="null">
+          <context context-type="linenumber">122</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="15f046007e4fca2e8477966745e2ec4e3e81bc3b">
+        <source>Video quota</source>
+        <target>Video-Kontingent</target>
+        <context-group name="null">
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="42e3c0e89177ca135974221eaf0e4e836c32e345">
+        <source>
+      Transcoding is enabled on server. The video quota only take in account <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>original<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> video. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/&gt;"/>
+      At most, this user could use ~ <x id="INTERPOLATION" equiv-text="{{ computeQuotaWithTranscoding() | bytes: 0 }}"/>.
+    </source>
+        <target>
+      Das Transcodieren ist auf diesem Server eingeschaltet. Das Video-Kontingent berücksichtigt nur das <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>ursprüngliche<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> Video. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/&gt;"/>
+      Dieser Nutzer kann maximal ca. <x id="INTERPOLATION" equiv-text="{{ computeQuotaWithTranscoding() | bytes: 0 }}"/> nutzen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5e8b4663c17c337a1f11160c0a683350936faa1f">
+        <source>Users list</source>
+        <target>Benutzerliste</target>
+        <context-group name="null">
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4ba250869daa372b54d24fafc0ea934769ee4076">
+        <source>Reason</source>
+        <target>Grund</target>
+        <context-group name="null">
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2bf5a31043ff476ca081a4080f3f3f17518dc6f2">
+        <source>Reporter</source>
+        <target>Melder</target>
+        <context-group name="null">
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2d1ea268a6a9f483dbc2cbfe19bf4256a57a6af4">
+        <source>Video</source>
+        <target>Video</target>
+        <context-group name="null">
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c6ab75e099e131d7a4f94e1732e7436d8fc386c7">
+        <source>Go to the account</source>
+        <target>Zum Konto gehen</target>
+        <context-group name="null">
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1cb8348c199d03e297d165e262237194f25fe3f5">
+        <source>Go to the video</source>
+        <target>Zum Video gehen</target>
+        <context-group name="null">
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="00ecde6001106fe7406a34cc3459cc5b88e4aec1">
+        <source>Blacklisted videos</source>
+        <target>Videos auf der Blacklist</target>
+        <context-group name="null">
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7c02d113e9b7884037834cddecf2a32a5538b35b">
+        <source>Name <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></source>
+        <target>Name <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></target>
+        <context-group name="null">
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cd5ca5da9e2fa21571e9f86a24a5c3b45a3ddc51">
+        <source>Views <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></source>
+        <target>Aufrufe <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></target>
+        <context-group name="null">
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d4717113115ca7106a354a5aac54d1c0126261d9">
+        <source>NSFW</source>
+        <target>NSFW (Nicht zur Ansicht am Arbeitsplatz geeignet)</target>
+        <context-group name="null">
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8c87d9527af7ff2ada84c911516a9e43a352e401">
+        <source>UUID</source>
+        <target>UUID</target>
+        <context-group name="null">
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="86f26b106c67be3c2e98b82766656e5d9da86dff">
+        <source>Unblacklist</source>
+        <target>Von der Blacklist nehmen</target>
+        <context-group name="null">
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="efad4be364b8fb5c73cbfcc7acccd542f9d84ad6">
+        <source>My settings</source>
+        <target>Meine Einstellungen</target>
+        <context-group name="null">
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="520d68b2c9f7dacaf2a5073716cad9bd328ea7e7">
+        <source>My video channels</source>
+        <target>Meine Video-Kanäle</target>
+        <context-group name="null">
+          <context context-type="linenumber">5</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d02888c485d3aeab6de628508f4a00312a722894">
+        <source>My videos</source>
+        <target>Meine Videos</target>
+        <context-group name="null">
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7cadf30b337f4ef9b05b7d02e13ec3cf79de9dba">
+        <source><x id="INTERPOLATION" equiv-text="{{ user.account?.followersCount }}"/> subscribers</source>
+        <target><x id="INTERPOLATION" equiv-text="{{ user.account?.followersCount }}"/> Abonnenten</target>
+        <context-group name="null">
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3fb9a5f7268114445d8c109a8f48102e93471f5a">
+        <source>Change your avatar</source>
+        <target>Ändere deinen Avatar</target>
+        <context-group name="null">
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c860c88df9ad58b1187084251340b232cdf0a7f9">
+        <source>(extensions: <x id="INTERPOLATION" equiv-text="{{ avatarExtensions }}"/>, max size: <x id="INTERPOLATION_1" equiv-text="{{ maxAvatarSize | bytes }}"/>)</source>
+        <target>(zulässige Datei-Erweiterungen: <x id="INTERPOLATION" equiv-text="{{ avatarExtensions }}"/>, maximale Größe: <x id="INTERPOLATION_1" equiv-text="{{ maxAvatarSize | bytes }}"/>)</target>
+        <context-group name="null">
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9518d3fb042d551167c1701ddeb88a1374cf1e48">
+        <source>Video quota:</source>
+        <target>Video-Kontingent:</target>
+        <context-group name="null">
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="994363f08f9fbfa3b3994ff7b35c6904fdff18d8">
+        <source>Profile</source>
+        <target>Profil</target>
+        <context-group name="null">
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b5398623f87ee72ed23f5023918db1707771e925">
+        <source>Video settings</source>
+        <target>Video-Einstellungen</target>
+        <context-group name="null">
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8057bddbed23d6cd911df8cc3a4ec24d1f258b79">
+        <source><x id="INTERPOLATION" equiv-text="{{ video.createdAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views</source>
+        <target><x id="INTERPOLATION" equiv-text="{{ video.createdAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> Aufrufe</target>
+        <context-group name="null">
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7">
+        <source>Delete</source>
+        <target>Löschen</target>
+        <context-group name="null">
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="73c1cefc348a6f361497210dea1ed79499fd1260">
+        <source>Create another video channel</source>
+        <target>Einen weiteren Video-Kanal erstellen</target>
+        <context-group name="null">
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="30fcac6c20aac1f24e000efc4a889cbb93d4baf2">
+        <source>Go to the channel</source>
+        <target>Zum Kanal gehne</target>
+        <context-group name="null">
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9dbe4718a5611fbc611fc6b5e0b27df813372c68">
+        <source>Create a video channel</source>
+        <target>Einen Video-Kanal erstellen</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9277e6f7b8ed9538d1f6ad812b620384252ffe56">
+        <source>Update <x id="INTERPOLATION" equiv-text="{{ videoChannel?.displayName }}"/></source>
+        <target><x id="INTERPOLATION" equiv-text="{{ videoChannel?.displayName }}"/> aktualisieren</target>
+        <context-group name="null">
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bc155f9fc3be3f32083f19b2c77d4ad3b696d9b9">
+        <source>Display name</source>
+        <target>Anzeigename</target>
+        <context-group name="null">
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="74728de5289ea2ff3f553bc2b48f1811680b931a">
+        <source>Short text to tell people how they can support your channel (membership platform...).&lt;br /&gt;&lt;br /&gt;
+When you will upload a video in this channel, the video support field will be automatically filled by this text.</source>
+        <target>Ein kurzer Text, der anderen erklärt, wie sie deinen Kanal unterstützen können.&lt;br /&gt;&lt;br /&gt;
+Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automatisch mit diesem Text gefüllt.</target>
+        <context-group name="null">
+          <context context-type="linenumber">32</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="739516c2ca75843d5aec9cf0e6b3e4335c4227b9">
+        <source>Change password</source>
+        <target>Passwort ändern</target>
+        <context-group name="null">
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e70e209561583f360b1e9cefd2cbb1fe434b6229">
+        <source>New password</source>
+        <target>Neues Passwort</target>
+        <context-group name="null">
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ede41f01c781b168a783cfcefc6fb67d48780d9b">
+        <source>Confirm new password</source>
+        <target>Neues Passwort bestätigen</target>
+        <context-group name="null">
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="fb17c44abac2d1ed2a54cdd28bae289dc0b9a1c2">
+        <source>Automatically plays video</source>
+        <target>Spiel das Video automatisch ab.</target>
+        <context-group name="null">
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="52c9a103b812f258bcddc3d90a6e3f46871d25fe">
+        <source>Save</source>
+        <target>Speichern</target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d2fa66a905b6b7f691c83be681d18188cbe4a8ba">
+        <source>Update my profile</source>
+        <target>Mein Profil aktualisieren</target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e242e3e8608a3c4a944327eb3d5c221dc6e4e3cd">
+        <source>
+  Sorry, but we couldn't find the page you were looking for.
+</source>
+        <target>
+  Ups, leider konnten wir die Seite, die du suchst, nicht finden.
+</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c65641c36859c328928e6b0f14c3f913886f8add">
+        <source>Created by <x id="INTERPOLATION" equiv-text="{{ videoChannel.ownerBy }}"/></source>
+        <target>Erstellt von <x id="INTERPOLATION" equiv-text="{{ videoChannel.ownerBy }}"/></target>
+        <context-group name="null">
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1380539d91f77f565de6e21ce210da891e6644b8">
+        <source>Support this channel</source>
+        <target>Unterstütze diesen Kanal</target>
+        <context-group name="null">
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5523952d0300c96cfba2ec5a693c95f923e90c40">
+        <source>Created <x id="INTERPOLATION" equiv-text="{{ videoChannel.createdAt | date }}"/></source>
+        <target>Erstellt am <x id="INTERPOLATION" equiv-text="{{ videoChannel.createdAt | date }}"/></target>
+        <context-group name="null">
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d4dcf74163f127ca9afa84d55b5d95846958faa0">
+        <source>Upload your video</source>
+        <target>Lade dein Video hoch</target>
+        <context-group name="null">
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1af3dcf5aad5b7f4b3251da88a89dc9a184445dd">
+        <source>Upload <x id="INTERPOLATION" equiv-text="{{ videoFileName }}"/></source>
+        <target><x id="INTERPOLATION" equiv-text="{{ videoFileName }}"/> hochladen</target>
+        <context-group name="null">
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="21add64f0f3ebbedf1150ca822c6e149494ab7a9">
+        <source>Select the file to upload</source>
+        <target>Wähle die Datei zum Hochladen aus</target>
+        <context-group name="null">
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0cc554f4d7bb6a87515d2d95438e183b50702071">
+        <source>Channel</source>
+        <target>Kanal</target>
+        <context-group name="null">
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3c78b53bca33467190c0b7a01320bc093a2b1427">
+        <source>Privacy</source>
+        <target>Privatsphäre</target>
+        <context-group name="null">
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f7ac2376749c7985f94f0fc89ba75ea624de1215">
+        <source>Publish will be available when upload is finished</source>
+        <target>Veröffentlichung ist möglich, sobald das Hochladen abgeschlossen ist</target>
+        <context-group name="null">
+          <context context-type="linenumber">53</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="223aae0477f79f0bc4436c1c57619415f04cbbb3">
+        <source>Publish</source>
+        <target>Veröffentlichen</target>
+        <context-group name="null">
+          <context context-type="linenumber">60</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="fdf7cbdc140d0aab0f0b6c06065a0fd448ed6a2e">
+        <source>Title</source>
+        <target>Titel</target>
+        <context-group name="null">
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cafc87479686947e2590b9f588a88040aeaf660b">
+        <source>Tags</source>
+        <target>Tags</target>
+        <context-group name="null">
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="935e7146fe6c12169abfda18536c5856935cfd82">
+        <source>(press Enter to add)</source>
+        <target>(zum Hinzufügen Eingabetaste drücken)</target>
+        <context-group name="null">
+          <context context-type="linenumber">15</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="50f53834157770b8205ada0e7a6e235211e4765e">
+        <source>Video descriptions are truncated by default and require manual action to expand them.</source>
+        <target>Video-Beschreibungen sind standardmäßig gekürzt und müssen manuell aufgeklappt werden.</target>
+        <context-group name="null">
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="607de17c2a755f65775881c19e276e7c933bcf94">
+        <source>Category</source>
+        <target>Kategorie</target>
+        <context-group name="null">
+          <context context-type="linenumber">44</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="78d6d3ea26777cd0dad8ddbf9b314151678da46c">
+        <source>Licence</source>
+        <target>Lizenz</target>
+        <context-group name="null">
+          <context context-type="linenumber">58</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="fe46ccaae902ce974e2441abe752399288298619">
+        <source>Language</source>
+        <target>Sprache</target>
+        <context-group name="null">
+          <context context-type="linenumber">72</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d69f4fafc780cc7dbafb063ca5f11e6f7c91b0c5">
+        <source>Schedule publication (<x id="INTERPOLATION" equiv-text="{{ calendarTimezone }}"/>)</source>
+        <target>Veröffentlichung planen (<x id="INTERPOLATION" equiv-text="{{ calendarTimezone }}"/>)</target>
+        <context-group name="null">
+          <context context-type="linenumber">101</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5ef7108218e096d09f4ee8525a05a8c90d7b95ee">
+        <source>This video contains mature or explicit content</source>
+        <target>Dieses Video enthält Inhalte, die möglicherweise für bestimmte Zuschauer ungeeignet sind oder von diesen als anstößig empfunden werden.</target>
+        <context-group name="null">
+          <context context-type="linenumber">116</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9daabdcaa2bbd83597099b10db22d056cf491644">
+        <source>Some instances do not list videos containing mature or explicit content by default.</source>
+        <target>Einige Instanzen zeigen keine Videos, die möglicherweise für bestimmte Zuschauer ungeeignet sind oder von diesen als anstößig empfunden werden.</target>
+        <context-group name="null">
+          <context context-type="linenumber">119</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3549ee96125a43181f80712ed744ee223a0e645a">
+        <source>Enable video comments</source>
+        <target>Video-Kommentare zulassen</target>
+        <context-group name="null">
+          <context context-type="linenumber">126</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7e549f41b715552ffe69b85c14a690d9d81c85f0">
+        <source>Wait transcoding before publishing the video</source>
+        <target>Warte das Transcodieren ab, bevor du das Video veröffentlichst</target>
+        <context-group name="null">
+          <context context-type="linenumber">132</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0001ec53fe3dfd603b7ad80fd32d262170e3d9a5">
+        <source>If you decide to not wait transcoding before publishing the video, it can be unplayable until it transcoding ends.</source>
+        <target>Wenn du dich entschließt, das Transcodieren vor Veröffentlichung des Videos nicht abzuwarten, ist es möglicherweise nicht abspielbar, bis das Transcodieren abgeschlossen ist.</target>
+        <context-group name="null">
+          <context context-type="linenumber">135</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c7742322b1d3dbc921362058d1747c7ec2adbec7">
+        <source>Basic info</source>
+        <target>Grundlegende Infos</target>
+        <context-group name="null">
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1dd793abd1cb8d16a7a2cb71ca5549a7111ee513">
+        <source>Upload thumbnail</source>
+        <target>Miniaturansicht hochladen</target>
+        <context-group name="null">
+          <context context-type="linenumber">146</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9df3f57e251c077bef7e7da81677cb971c55b639">
+        <source>Upload preview</source>
+        <target>Vorschau hochladen</target>
+        <context-group name="null">
+          <context context-type="linenumber">153</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b5629d298ff1a69b8db19a4ba2995c76b52da604">
+        <source>Support</source>
+        <target>Unterstützen</target>
+        <context-group name="null">
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f61f989de6fc12f99369a90800e4b5462d3f10a0">
+        <source>Short text to tell people how they can support you (membership platform...).</source>
+        <target>Ein kurzer Text, der anderen erklärt, wie sie dich unterstützen können.</target>
+        <context-group name="null">
+          <context context-type="linenumber">160</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d91da0abc638c05e52adea253d0813f3584da4b1">
+        <source>Advanced settings</source>
+        <target>Erweiterte Einstellungen</target>
+        <context-group name="null">
+          <context context-type="linenumber">142</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c07377d8b52fde03fcf70824a980346b9222d056">
+        <source>(extensions: <x id="INTERPOLATION" equiv-text="{{ videoImageExtensions }}"/>, max size: <x id="INTERPOLATION_1" equiv-text="{{ maxVideoImageSize | bytes }}"/>)</source>
+        <target>(zulässige Datei-Erweiterungen: <x id="INTERPOLATION" equiv-text="{{ videoImageExtensions }}"/>, maximale Größe: <x id="INTERPOLATION_1" equiv-text="{{ maxVideoImageSize | bytes }}"/>)</target>
+        <context-group name="null">
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2335f0bd17c63d835b50cfbbcea6c459cb1314c0">
+        <source>
+    Update <x id="INTERPOLATION" equiv-text="{{ video?.name }}"/>
+  </source>
+        <target>
+    <x id="INTERPOLATION" equiv-text="{{ video?.name }}"/> aktualisieren
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="047f50bc5b5d17b5bec0196355953e1a5c590ddb">
+        <source>Update</source>
+        <target>Aktualisieren</target>
+        <context-group name="null">
+          <context context-type="linenumber">93</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9aafb2a928664aa7a9375fd37c533f0375f8b611">
+        <source>Download video</source>
+        <target>Video herunterladen</target>
+        <context-group name="null">
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b92eaf680d6d1cd83e1bc61c3ee88b1b7754eb66">
+        <source>Torrent</source>
+        <target>Torrent</target>
+        <context-group name="null">
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8d6a41c2703bed3edfc76e1df0b1ca203404c17c">
+        <source>Direct download</source>
+        <target>Direkter Download</target>
+        <context-group name="null">
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6ac01cebf6f87418b309a83d5ce965d77b4ab740">
+        <source>Torrent (magnet)</source>
+        <target>Torrent (Magnet)</target>
+        <context-group name="null">
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="dc75033a5238fdc4f462212c847a45ba8018a3fd">
+        <source>Download</source>
+        <target>Herunterladen</target>
+        <context-group name="null">
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="11749f4fc0aa1b5e37f38575e4d4e3b1b7e0e96b">
+        <source>Report video</source>
+        <target>Video melden</target>
+        <context-group name="null">
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bb44873ad8d4c5dbad0ac2a6a50e0ceee9119125">
+        <source>Reason...</source>
+        <target>Grund...</target>
+        <context-group name="null">
+          <context context-type="linenumber">14</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0e6b8229bd65f93bc8040d0fb598967f220740c7">
+        <source>
+              Cancel
+            </source>
+        <target>
+              Abbrechen
+            </target>
+        <context-group name="null">
+          <context context-type="linenumber">22</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="71c77bb8cecdf11ec3eead24dd1ba506573fa9cd">
+        <source>Submit</source>
+        <target>Abschicken</target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0bd8b27f60a1f098a53e06328426d818e3508ff9">
+        <source>Share</source>
+        <target>Teilen</target>
+        <context-group name="null">
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="801b98c6f02fe3b32f6afa3ee854c99ed83474e6">
+        <source>URL</source>
+        <target>URL</target>
+        <context-group name="null">
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d3b15c3bf4a7ea38d6002d2d2c4781642d30e79c">
+        <source>Embed</source>
+        <target>Einbetten</target>
+        <context-group name="null">
+          <context context-type="linenumber">24</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="239fe0316cfe91aa6e1e7bf1ef19e3b7772131f8">
+        <source>
+          The url is not secured (no HTTPS), so the embed video won't work on HTTPS websites (web browsers block non secured HTTP requests on HTTPS websites).
+        </source>
+        <target>
+          Diese URL ist nicht sicher (kein HTTPS), das Video kann als nicht in Webseiten eingebettet werden, die über HTTPS ausgeliefert werden (Web-Browser blockieren unsichere HTTP-Verbindungen auf sicheren HTTPS-Webseiten).
+        </target>
+        <context-group name="null">
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9ed65ae88f6c982bc44d6fed2796e55f47dbf304">
+        <source>
+    The video is being transcoded, it may not work properly.
+  </source>
+        <target>
+    Dieses Video wird transcodiert, es funktioniert daher möglicherweise nicht ganz.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="fbc205ea3d06fa8f65973fa3b490ae172f71c087">
+        <source>
+    This video will be published on <x id="INTERPOLATION" equiv-text="{{ video.scheduledUpdate.updateAt | date: 'full' }}"/>
+  </source>
+        <target>
+    Dieses Video wird am <x id="INTERPOLATION" equiv-text="{{ video.scheduledUpdate.updateAt | date: 'full' }}"/> veröffentlicht
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="643ab402461b1169eebbe2ed790e12a9a83551aa">
+        <source>
+            <x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views
+          </source>
+        <target>
+            <x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> Aufrufe
+          </target>
+        <context-group name="null">
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5cb397241041f7ad70997806227bafcdf7eb1b33">
+        <source>Go the channel page</source>
+        <target>Zur Seite des Kanals gehen</target>
+        <context-group name="null">
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ccc07df383b7a32be3e2e105faa5488caf261c1c">
+        <source>By <x id="INTERPOLATION" equiv-text="{{ video.by }}"/></source>
+        <target>Von <x id="INTERPOLATION" equiv-text="{{ video.by }}"/></target>
+        <context-group name="null">
+          <context context-type="linenumber">35</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="be73b652c2707f42b5d780d0c7b8fc5ea0b1706c">
+        <source>Go to the account page</source>
+        <target>Zur Konto-Seite gehen</target>
+        <context-group name="null">
+          <context context-type="linenumber">34</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="82b59049f3f89d900c98da9319e156dd513e3ced">
+        <source>Like this video</source>
+        <target>Das Video gefällt mir</target>
+        <context-group name="null">
+          <context context-type="linenumber">47</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="623698f075025b2b2fc2e0c59fd95f4f4662a509">
+        <source>Dislike this video</source>
+        <target>Das Video gefällt mir nicht</target>
+        <context-group name="null">
+          <context context-type="linenumber">54</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="144fff5c40b85414d59e644d8dee7cfefba925a2">
+        <source>Download the video</source>
+        <target>Video herunterladen</target>
+        <context-group name="null">
+          <context context-type="linenumber">74</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f72992030f134408b675152c397f9d0ec00f3b2a">
+        <source>Report</source>
+        <target>Melden</target>
+        <context-group name="null">
+          <context context-type="linenumber">81</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2f4894617d9c44010f87473e583bd4604b7d6ecf">
+        <source>Report this video</source>
+        <target>Dieses Vieo melden</target>
+        <context-group name="null">
+          <context context-type="linenumber">80</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="007ab5fa2aae8a7372307d3fc45a2dbcb11ffd61">
+        <source>Blacklist</source>
+        <target>Auf die Blacklist setzen</target>
+        <context-group name="null">
+          <context context-type="linenumber">87</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="803c6317abd2dbafcc93226c4e273c62932e3037">
+        <source>Blacklist this video</source>
+        <target>Dieses Video auf die Blacklist setzen</target>
+        <context-group name="null">
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cd27f761b923a5bdb16ba9844da632edd878f1b1">
+        <source>Update this video</source>
+        <target>Dieses Video aktualisieren</target>
+        <context-group name="null">
+          <context context-type="linenumber">92</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3dbfdc68f83d91cb360172eb65578cae94e7cbe5">
+        <source>Delete this video</source>
+        <target>Dieses Video löschen</target>
+        <context-group name="null">
+          <context context-type="linenumber">98</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f0c5f6f270e70cbe063b5368fcf48f9afc1abd9b">
+        <source>Show more</source>
+        <target>Mehr anzeigen</target>
+        <context-group name="null">
+          <context context-type="linenumber">118</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5403a767248e304199592271bba3366d2ca3f903">
+        <source>Show less</source>
+        <target>Weniger anzeigen</target>
+        <context-group name="null">
+          <context context-type="linenumber">124</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8057a9b7f9e908ff350edfd71417b96c174e5911">
+        <source>
+            Privacy
+          </source>
+        <target>
+            Privatsphäre
+          </target>
+        <context-group name="null">
+          <context context-type="linenumber">131</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bd407eca607a8905a26a9e30c9d0cd70f4465db8">
+        <source>
+            Category
+          </source>
+        <target>
+            Kategorie
+          </target>
+        <context-group name="null">
+          <context context-type="linenumber">140</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="af5072bd79ea3cd767ab74a6622d2eee791b3832">
+        <source>
+            Licence
+          </source>
+        <target>
+            Lizenz
+          </target>
+        <context-group name="null">
+          <context context-type="linenumber">149</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a911eee019174741b0aec6fcf3fbd5752fab3e67">
+        <source>
+            Language
+          </source>
+        <target>
+            Sprache
+          </target>
+        <context-group name="null">
+          <context context-type="linenumber">158</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ecf7007c2842cc26a7b91d08d48c7a4f5f749fb3">
+        <source>
+            Tags
+          </source>
+        <target>
+            Tags
+          </target>
+        <context-group name="null">
+          <context context-type="linenumber">167</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7ce8b0d7cc34d4c1ef4a21e990b0a001337bedd1">
+        <source>
+        Other videos
+      </source>
+        <target>
+        Andere Videos
+      </target>
+        <context-group name="null">
+          <context context-type="linenumber">181</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="fb779d2b25c4d0ffa7d52c823a240717e8c1fe6c">
+        <source>Friendly Reminder:</source>
+        <target>Freundliche Erinnerung:</target>
+        <context-group name="null">
+          <context context-type="linenumber">193</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4c2fca29fd9d7e85abe85a206958a4226f403be2">
+        <source>
+        The sharing system used by this video implies that some technical information about your system (such as a public IP address) can be accessed publicly.
+      </source>
+        <target>
+       Die Technik, die von diesem Video genutzt wird, macht einige technische Informationen über dein System (wie die öffentliche IP-Adresse) öffentlich zugänglich.
+      </target>
+        <context-group name="null">
+          <context context-type="linenumber">195</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e60c11e1b1dfbbeda577364b8de39ded2d796c5e">
+        <source>More information</source>
+        <target>Weitere Informationen</target>
+        <context-group name="null">
+          <context context-type="linenumber">198</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bd499ca7913bb5408fd139a4cb4f863852d5f318">
+        <source>Get more information</source>
+        <target>Weitere Informationen bekommen</target>
+        <context-group name="null">
+          <context context-type="linenumber">198</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="20fc98888baf65b5ba9fe9622dc036fa8dec6a5f">
+        <source>
+      OK
+    </source>
+        <target>
+     OK
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">201</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b5f5df598f2d75640849b2a7744f91e5dbd390e7">
+        <source>
+      Comments
+    </source>
+        <target>
+      Kommentare
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="10a248adb1ee12830355a04ac3cde2bad2d41d7d">
+        <source>Short description should not be longer than 250 characters.</source>
+        <target>Die Kurzbeschreibung sollte nicht mehr als 250 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="05ad6b99d9bf7b51968aa0b0b939e8627a329bea">
+        <source>Username must be at least 3 characters long.</source>
+        <target>Der Benutzername muss mindestens 3 Zeichen lang sein.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d4b11fd0ddeea39b33f911d3aac1e82799cdaaef">
+        <source>Username cannot be more than 20 characters long.</source>
+        <target>Der Benutzername darf nicht länger als 20 Zeichen lang sein.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5acbe0aa7a7157b1f09057a98ba01ab578a303a9">
+        <source>Username should be only lowercase alphanumeric characters.</source>
+        <target>Der Benutzername sollte nur kleine alphanumerische Zeichen enthalten.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1fe26e49476ac701885abc59127e96a3760847f0">
+        <source>Password must be at least 6 characters long.</source>
+        <target>Das Passwort muss mindestens 6 Zeichen lang sein.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0a154031f3e66985af96d5f903441cf84f0dc75e">
+        <source>Password cannot be more than 255 characters long.</source>
+        <target>Das Passwort darf nicht länger als 255 Zeichen lang sein.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="abede840116d58f04a55d99a6cbd68da8a3e1bbf">
+        <source>Video quota is required.</source>
+        <target>Das Video-Kontingent muss angegeben werden.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="93a6dc1d3aa0d3201c86ef1ec8adf5cf0ada3c80">
+        <source>Quota must be greater than -1.</source>
+        <target>Das Kontingent muss größer als -1 sein.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="545e77fd5d9526228a2133109447c23225ed9c85">
+        <source>User role is required.</source>
+        <target>Die Benutzerrolle muss angegeben werden.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="1c417b7aef730d6ef5d62fa8a0a7e25e3a2393e4">
+        <source>Display name is required.</source>
+        <target>Der Anzeigename muss angegeben werden.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bdeb1a8e69e137572df795d64120ea85069b7674">
+        <source>Display name must be at least 3 characters long.</source>
+        <target>Der Anzeigename muss mindestens 3 Zeichen lang sein.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e81bda510399d52f26a44a15c3dbf4d6205d90a9">
+        <source>Display name cannot be more than 120 characters long.</source>
+        <target>Der Anzeigename darf nicht länger als 120 Zeichen lang sein.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d531c2261dc0c2739bd7cbb2bb175946b7eeb3ae">
+        <source>Description must be at least 3 characters long.</source>
+        <target>Die Beschreibung muss mindestens 3 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="916a6e4fd83ece1dc54c6135eb3b8cd064b4bac3">
+        <source>Description cannot be more than 250 characters long.</source>
+        <target>Die Beschreibung darf nicht mehr als 250 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b3cf1889d2fdd6b15e697c270c9b80772fe2cae6">
+        <source>Report reason is required.</source>
+        <target>Es muss ein Grund für den Bericht angegeben werden.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="993f9f5703d449a1d467243db75253d288a2947e">
+        <source>Report reason must be at least 2 characters long.</source>
+        <target>Der Grund für die Meldung muss mindestens 2 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7de2178ed1036844fb1c3ad8b7899a039fcdcdb9">
+        <source>Report reason cannot be more than 300 characters long.</source>
+        <target>Der Grund für die Meldung darf nicht mehr als 300 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="fac936be125163a8494f3d7e7f21d65c7e4f1ff6">
+        <source>Description cannot be more than 500 characters long.</source>
+        <target>Die Beschreibung darf nicht mehr als 500 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e7182e21e9566cc81c83f92727461322f71fd69b">
+        <source>Support text must be at least 3 characters long.</source>
+        <target>Die Beschreibung zur Unterstützung muss mindestens 3 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3fe80c71378e127dda2dda9dbcd66b059d362813">
+        <source>Support text cannot be more than 500 characters long.</source>
+        <target>Die Beschreibung zur Unterstützung darf nicht mehr als 500 Zeichen umfassen</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f5a94cae76685e72f33541b977efdd7845cb0ed6">
+        <source>Comment must be at least 2 characters long.</source>
+        <target>Der Kommentar muss mindestens 2 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7c194080446ee6901fd17a8b8648534ffe98b123">
+        <source>Comment cannot be more than 3000 characters long.</source>
+        <target>Der Kommentar darf nicht mehr als 3000 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c27cc734f76efd221663921dd0898ea7c8bcbb5c">
+        <source>Video name must be at least 3 characters long.</source>
+        <target>Der Name des Videos muss mindestens 3 Zeichen lang sein.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0320d0f7f8eec2341e27ca53d7875217a3d99695">
+        <source>Video name cannot be more than 120 characters long.</source>
+        <target>Der Name des Videos darf nicht länger als 120 Zeichen lang sein.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="af5e2d5f3ac817c735fb7ff9ca16322789f66fef">
+        <source>Video description must be at least 3 characters long.</source>
+        <target>Die Beschreibung des Videos muss mindestens 3 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ce28a9403c2d7e5da2e59af27118f8b6d109e906">
+        <source>Video description cannot be more than 10000 characters long.</source>
+        <target>Die Beschreibung des Videos darf nicht nicht mehr als 10000 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f1cffdc2e156716cd9880201d65ba457d11464f8">
+        <source>A tag should be more than 2 characters long.</source>
+        <target>Ein Tag sollte mindestens 2 Zeichen lang sein.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="34a0811f9a2a7366cc9efcdad52ea59b105326ea">
+        <source>A tag should be less than 30 characters long.</source>
+        <target>Ein Tag sollte weniger als 30 Zeichen lang sein.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="665092574f9af9fec262f8349b67b14192391ae6">
+        <source>Video support must be at least 3 characters long.</source>
+        <target>Die Beschreibung zur Unterstützung muss mindestens 3 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e61f1c05121fa5effa6ccddf5be6dcf1c822ff4b">
+        <source>Video support cannot be more than 500 characters long.</source>
+        <target>Die Beschreibung zur Unterstützung darf nicht mehr als 500 Zeichen umfassen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="0f286a597f0053c3578a52e044769c204ee516fc">
+        <source>Server error. Please retry later.</source>
+        <target>Server-Fehler. Bitte später erneut versuchen.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d31d39e8ee9b2f20bffb3468ee062eaa5409c59f">
+        <source>Your video quota is exceeded with this video (video size: <x id="INTERPOLATION" equiv-text="{{ videoSize }}"/>, used: <x id="INTERPOLATION_1" equiv-text="{{ videoQuotaUsed }}"/>, quota: <x id="INTERPOLATION_2" equiv-text="{{ videoQuota }}"/>)</source>
+        <target>Dein Video-Kontingent ist mit diesem Video erschöpft (Größe des Videos: <x id="INTERPOLATION" equiv-text="{{ videoSize }}"/>, genutzt: <x id="INTERPOLATION_1" equiv-text="{{ videoQuotaUsed }}"/>, Kontingent: <x id="INTERPOLATION_2" equiv-text="{{ videoQuota }}"/>)</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ed013c2c29216501c688e9cb5f3a1c9fd9147b71">
+        <source>This video contains mature or explicit content. Are you sure you want to watch it?</source>
+        <target>Dieses Video enthält Inhalte, die möglicherweise für bestimmte Zuschauer ungeeignet sind oder von diesen als anstößig empfunden werden. Möchtest du es wirklich ansehen?</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5ba3d522e4146eefcbd5c222247c1e2423d27cd8">
+        <source>Mature or explicit content</source>
+        <target>Inhalt, der möglicherweise für bestimmte Zuschauer ungeeignet oder anstößig ist</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7e892ba15f2c6c17e83510e273b3e10fc32ea016">
+        <source>Search</source>
+        <target>Suche</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file></xliff>
 \ No newline at end of file
diff --git a/client/src/locale/target/angular_fr_FR.xml b/client/src/locale/target/angular_fr_FR.xml
index 7ad0013a1..681f65e7f 100644
--- a/client/src/locale/target/angular_fr_FR.xml
+++ b/client/src/locale/target/angular_fr_FR.xml
@@ -1517,7 +1517,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
      </trans-unit>
      <trans-unit id="c65641c36859c328928e6b0f14c3f913886f8add">
        <source>Created by <x id="INTERPOLATION" equiv-text="{{ videoChannel.ownerBy }}"/></source>
-        <target>Créé par <x id="INTERPOLATION" equiv-text="{{ videoChannel.ownerBy }}"/></target>
+        <target>Créée par <x id="INTERPOLATION" equiv-text="{{ videoChannel.ownerBy }}"/></target>
        <context-group name="null">
          <context context-type="linenumber">14</context>
        </context-group>
@@ -1904,7 +1904,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
      </trans-unit>
      <trans-unit id="be73b652c2707f42b5d780d0c7b8fc5ea0b1706c">
        <source>Go to the account page</source>
-        <target>Aller sur la page du compte</target>
+        <target>Accéder au profil public de l'utilisateur</target>
        <context-group name="null">
          <context context-type="linenumber">34</context>
        </context-group>
@@ -3294,77 +3294,77 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
      </trans-unit>
      <trans-unit id="0b2054a863319d2cf59867addd125b6717cae41d">
        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> years ago</source>
-        <target>il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> ans</target>
+        <target>Publiée, il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> ans</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
      <trans-unit id="e622d3813449fe36371ea258281059306819199d">
        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> months ago</source>
-        <target>il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> mois</target>
+        <target>Publiée, il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> mois</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
      <trans-unit id="2f8a5a5f7efb521d7d89dc659ff65dd13cb7b17b">
        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> month ago</source>
-        <target>il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> mois</target>
+        <target>Publiée, il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> mois</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1d1a46543a29096d3c6676be2d561380a0bc94e1">
        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> weeks ago</source>
-        <target>il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> semaines</target>
+        <target>Publiée, il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> semaines</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
      <trans-unit id="e1db0b98b6cdf817508195f3649c48475c32ae7e">
        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> week ago</source>
-        <target>il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> semaine</target>
+        <target>Publiée, il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> semaine</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
      <trans-unit id="a7654c3ece96e777527606f1c2870d6ee0b180f7">
        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> days ago</source>
-        <target>il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> jours</target>
+        <target>Publiée, il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> jours</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5b465235ae55091d32535e23dd180c407f1352d1">
        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> day ago</source>
-        <target>il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> jour</target>
+        <target>Publiée, il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> jour</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
      <trans-unit id="dc7addf53bd6405a9c746db6dfca665c33679a84">
        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> hours ago</source>
-        <target>il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> heures</target>
+        <target>Publiée, il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> heures</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
      <trans-unit id="d54a610250ed38efccf0e3afdd0004f6ad83ea8d">
        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> hour ago</source>
-        <target>il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> heure</target>
+        <target>Publiée, il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> heure</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
      <trans-unit id="9704e5e3adce178c127ead05f7057d3fb827308a">
        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> min ago</source>
-        <target>il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> min</target>
+        <target>Publiée, il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> min</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7a158a7555a44ea7eff9fa4988df9aa24d262ceb">
        <source><x id="INTERPOLATION" equiv-text="{{interval}}"/> sec ago</source>
-        <target>il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> sec</target>
+        <target>Publiée, il y a <x id="INTERPOLATION" equiv-text="{{interval}}"/> sec</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
@@ -3623,7 +3623,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
      </trans-unit>
      <trans-unit id="7e892ba15f2c6c17e83510e273b3e10fc32ea016">
        <source>Search</source>
-        <target>Chercher</target>
+        <target>Résultats de la recherche</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
diff --git a/client/src/locale/target/angular_oc.xml b/client/src/locale/target/angular_oc.xml
index d58000bdb..553df7050 100644
--- a/client/src/locale/target/angular_oc.xml
+++ b/client/src/locale/target/angular_oc.xml
@@ -380,6 +380,17 @@
          <context context-type="linenumber">25</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="ac324b07e7c3c972f1c33894eda02dc2917eda5e">
+        <source>
+      this instance provides a baseline quota of <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> space for the videos of its users.
+    </source>
+        <target>
+      aquesta instància provesís un quòta de basa de <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> d’espaci per las vidèos de sos utilizaires.
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="a6865ec6abf6af58f808501d84c8ed6ff8ce46ae">
        <source>
      this instance provides unlimited space for the videos of its users.
@@ -418,6 +429,17 @@
          <context context-type="linenumber">6</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="c2bc16265b72b9af4a4374b805931ae03e3f73a5">
+        <source>
+    It is a free and open-source software, under the <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>AGPLv3 licence<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
+  </source>
+        <target>
+    Es un logicial liure e open-source, jos la <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>licéncia AGPLv3<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="a10308f7ac111f5b66d08af0a24fc9ddf143931a">
        <source>
    For more information, please visit <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>joinpeertube.org<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
@@ -499,6 +521,13 @@
          <context context-type="linenumber">16</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="8bc634cd9d8c9b684dbfaaf17a522f894bedbffc">
+        <source>Joined <x id="INTERPOLATION" equiv-text="{{ account.createdAt | date }}"/></source>
+        <target>Arribat lo <x id="INTERPOLATION" equiv-text="{{ account.createdAt | date }}"/></target>
+        <context-group name="null">
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="8fef247fd0c5bf790151f7661cafc4b7fd0397f3">
        <source><x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount }}"/> subscribers</source>
        <target><x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount }}"/> abonats</target>
@@ -639,6 +668,13 @@
          <context context-type="linenumber">141</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="6e671e839ca889feef0d8ed525d1a44b4b10870c">
+        <source>Indicates the Twitter account for the website or platform on which the content was published.</source>
+        <target>Indica lo compte Twitter del site o de la plataforma ont lo contengut foguèt publicat.</target>
+        <context-group name="null">
+          <context context-type="linenumber">144</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="c0716c28b9d4c9e0b2fd6031334394214e5f9605">
        <source>Instance whitelisted by Twitter</source>
        <target>Instàncias en lista blanca per Twitter</target>
diff --git a/client/src/locale/target/angular_pl_PL.xml b/client/src/locale/target/angular_pl_PL.xml
index acd4333ad..5bc09d040 100644
--- a/client/src/locale/target/angular_pl_PL.xml
+++ b/client/src/locale/target/angular_pl_PL.xml
@@ -227,6 +227,17 @@
          <context context-type="linenumber">76</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="b8ccc4f1b3f839fca9bd59e072f715fd487d540f">
+        <source>
+               My public profile
+              </source>
+        <target>
+               Mój profil publiczny
+              </target>
+        <context-group name="null">
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="c84b721e9325c9cce20d92f4dbd66898ab5ec947">
        <source>
                My account
@@ -340,6 +351,17 @@
          <context context-type="linenumber">7</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="5849c589454817c1e991639d3091d8da0e8d6bd2">
+        <source>
+  About <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> instance
+</source>
+        <target>
+  O instancji <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/>
+</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="eec715de352a6b114713b30b640d319fa78207a0">
        <source>Description</source>
        <target>Opis</target>
@@ -361,6 +383,79 @@
          <context context-type="linenumber">25</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="ac324b07e7c3c972f1c33894eda02dc2917eda5e">
+        <source>
+      this instance provides a baseline quota of <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> space for the videos of its users.
+    </source>
+        <target>
+      ta instancja oferuje podstawową powierzchnię <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> na filmy swoich użytkowników.
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a6865ec6abf6af58f808501d84c8ed6ff8ce46ae">
+        <source>
+      this instance provides unlimited space for the videos of its users.
+    </source>
+        <target>
+      ta instancja oferuje nieograniczoną powierzchnię na filmy dla swoich użytkowników.
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5c856a6a233b6f6c4cc8eed46436d31d2da63fc1">
+        <source>
+    User registration is currently not allowed.
+  </source>
+        <target>
+    Rejestracja użytkowników nie jest obecnie dozwolona.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a11e3ba2c5aea841de67a3c85892bb61295e94dc">
+        <source>
+  About PeerTube
+</source>
+        <target>
+  O PeerTube
+</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bd29138e1e17572596ce8f2fe61bcea6ac5fb0bf">
+        <source>PeerTube is a federated (ActivityPub) video streaming platform using P2P (WebTorrent) directly in the web browser.</source>
+        <target>PeerTube jest sfederowaną (ActivityPub) platformą streamingową filmów korzystającą z P2P (WebTorrent) bezpośrednio w przeglądarce.</target>
+        <context-group name="null">
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c2bc16265b72b9af4a4374b805931ae03e3f73a5">
+        <source>
+    It is a free and open-source software, under the <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>AGPLv3 licence<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
+  </source>
+        <target>
+    Jest to wolne i otwartoźródłowe oprogramowanie udostępniane na licencji <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>AGPLv3 licence<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a10308f7ac111f5b66d08af0a24fc9ddf143931a">
+        <source>
+    For more information, please visit <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>joinpeertube.org<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
+  </source>
+        <target>
+    Aby uzyskać więcej informacji, odwiedź <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>joinpeertube.org<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="c02493cfa08b82c468233b83069b5baff23890e1">
        <source>P2P &amp; Privacy</source>
        <target>P2P i prywatność</target>
@@ -368,6 +463,219 @@
          <context context-type="linenumber">18</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="cd429d53cb8f4a87879301248e38cb85f07fa9d6">
+        <source>
+    PeerTube uses the BitTorrent protocol to share bandwidth between users.
+    This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video.
+  </source>
+        <target>
+    PeerTube używa protokołu BitTorrent, aby dzielić przepustowość pomiędzy użytkowników.
+    Oznacza to, że Twój adres IP jest przechowywany przez tracker BitTorrent instancji tak długo, jak pobierasz lub oglądasz film.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e4ce50f3019e3ebe9a479784c6cb68a31c7a8231">
+        <source>What are the consequences?</source>
+        <target>Jakie są tego konsekwencje?</target>
+        <context-group name="null">
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9a612748b059ad246935df17ef4ec4e6afb43a2a">
+        <source>
+    In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video.
+    In practice, this is much more difficult because:
+  </source>
+        <target>
+    Teoretycznie, osoba mająca wystarczające umiejętności techniczne mogłaby utworzyć skrypt zbierający informacje, które IP pobierają ten film.
+    W praktyce, jest to trochę bardziej skomplikowane, ponieważ:
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="64f96be62df4a95a0615b6f630ad25d6348a29d3">
+        <source>
+      An HTTP request has to be sent on each tracker for each video to spy.
+      If we want to spy all PeerTube's videos, we have to send as many requests as there are videos (so potentially a lot)
+    </source>
+        <target>
+      Żądanie HTTP musiałoby zostać wysłane do każdego trackera dla każdego filmu.
+      Jeżeli chcemy szpiegować wszystkie filmy na PeerTube, musielibyśmy wysłać tyle zgłoszeń, ile jest filmów (potencjalnie bardzo dużo)
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="dd9a7a4ee66b0ff3fbb43ba8691ffcd042531611">
+        <source>
+      For each request sent, the tracker returns random peers at a limited number.
+      For instance, if there are 1000 peers in the swarm and the tracker sends only 20 peers for each request, there must be at least 50 requests sent to know every peers in the swarm
+    </source>
+        <target>
+      Dla każdego wysłanego żądania tracker zwraca ograniczoną liczbę losowych peerów.
+      Na przykład, jeżeli łącznie peeruje 1000 osób a tracker zwraca 20 peerów dla każdego żądania, co najmniej 50 zgłoszeń musi zostać wykonanych, aby poznać wszystkich peerujących
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="694cf53adfc2afe8afabf713ab00fa114d5d2f8e">
+        <source>
+      Those requests have to be sent regularly to know who starts/stops watching a video. It is easy to detect that kind of behaviour
+    </source>
+        <target>
+      Te zgłoszenia muszą być wysyłane regularnie, aby wiedzieć kto zaczyna/kończy oglądać film. Łatwo jest wykryć takie zachowanie
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="44bbecddbdf2aad1f4bad97cb806560553fb2ab3">
+        <source>
+      If an IP address is stored in the tracker, it doesn't mean that the person behind the IP (if this person exists) has watched the video
+    </source>
+        <target>
+      To, że adres IP jest przechowywany przez tracker nie oznacza, że osoba posługująca się tym IP (jeżeli ta osoba istnieje) oglądała ten film
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">47</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="fec3239a860de66c718e3442df836b692b8568c3">
+        <source>
+      The IP address is a vague information : usually, it regularly changes and can represent many persons or entities
+    </source>
+        <target>
+      Adres IP nie jest precyzyjną informacją – zwykle zmienia się regularnie i może reprezentować wiele jednostek
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c5e62151cca9610f4248c9616909f7acaf5e5a32">
+        <source>
+      Web peers are not directly sent by the tracker: because we use WebRTC inside the web browser, the protocol is different from classic BitTorrent.
+      When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers to forward the information to.
+      See <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>this document<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> for more information
+    </source>
+        <context-group name="null">
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="50d8e8388f5ceab292850ed828f306c9f2cab389">
+        <source>
+    The worst-case scenario of an average person spying on their friends is quite unlikely.
+    There are much more effective ways to get that kind of information.
+  </source>
+        <target>
+    Najgorszy przypadek, gdy przeciętna osoba szpieguje swoich znajomych jest mało prawdopodobny.
+    Jest wiele bardziej skutecznych sposobów, aby uzyskać takie informacje.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">62</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b7801222ec2b04de2f61d3ff01d18a04bfa17505">
+        <source>How does PeerTube compares to YouTube?</source>
+        <target>Jak to wygląda w porównaniu do YouTube?</target>
+        <context-group name="null">
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2432705cbabcb92a8677338901dd5d655383ef4c">
+        <source>
+    The threats to privacy in YouTube are different from PeerTube's.
+    In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you.
+    Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics).
+  </source>
+        <target>
+    Zagrożenia dla prywatności na YouTube różnią się od tych na PeerTube.
+    W przypadku YouTube, platforma zdobywa ogromną liczbę informacji osobistych (nie tylko IP), aby analizować je i śledzić Cię.
+    Co więcej, YouTube należy do Google/Alphabet – firmy która śledzi Cię na wielu stronach (za pośrednictwem AdSense i Google Analytics).
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">69</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3c2990d5e452bdf2317ff23745db70705d848d99">
+        <source>What can I do to limit the exposure of my IP address?</source>
+        <target>Jak mogę ograniczyć widoczność mojego adresu IP?</target>
+        <context-group name="null">
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a545356de272b955258c2a2432b08ec637b65f7e">
+        <source>
+    Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing your IP in their connection logs: ISP/routers/trackers/CDN and more.
+    PeerTube is transparent about it: we warn you that if you want to keep your IP private, you must use a VPN or Tor Browser.
+    Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense.
+  </source>
+        <target>
+    Twój adres IP jest publiczny, więc za każdym razem gdy odwiedzasz stronę, wiele podmiotów (poza końcową stroną) ma dostęp do Twojego IP w dziennikach połączeń: ISP/routery/trackery/CDN i więcej.
+    PeerTube jest przejrzysty pod tym względem – ostrzegamy, że jeżeli chcesz ukryć swój adres IP, musisz używać VPN-a lub przeglądarki TOR Browser.
+    Myślenie, że usunięcie P2P z PeerTube przywróci anonimowość nie miałoby sensu.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">77</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8ce78dd287b9a9dde5079916425ea66466530e41">
+        <source>What will be done to mitigate this problem?</source>
+        <target>Co zostanie zrobione, aby złagodzić ten problem?</target>
+        <context-group name="null">
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d8f1c6b816aaf1ebcb936a705dbe88bcef28eaa8">
+        <source>
+    PeerTube is only in beta, and want to deliver the best countermeasures possible by the time the stable is released.
+    In the meantime, we want to test different ideas related to this issue:
+  </source>
+        <target>
+    PeerTube jest dopiero w fazie beta, zamierzamy dostarczyć najlepsze możliwe środki zaradcze wraz z wersją stabilną.
+    W międzyczasie, zamierzamy przetestować różne pomysły związane z tym problemem:
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d32608aba08c6bb3cc4e4e8ec6223e5f4e78ca19">
+        <source>Set a limit to the number of peers sent by the tracker</source>
+        <target>Ustawienie maksymalnej liczby peerów wysłanych przez tracker</target>
+        <context-group name="null">
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a6d732b614143f862e69798046dc0868716547e5">
+        <source>Set a limit on the request frequency received by the tracker (being tested)</source>
+        <target>Ustawienie maksymalnej częstotliwości otrzymywania żądań przez tracker (jest testowane)</target>
+        <context-group name="null">
+          <context context-type="linenumber">92</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ba77e356eaa5c06caaf5c8734c361d1a5415fe1c">
+        <source>Ring a bell if there are unusual requests (being tested)</source>
+        <target>Reagowanie na nietypowe żądania (jest testowane)</target>
+        <context-group name="null">
+          <context context-type="linenumber">93</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="81861ff8a71c8a5881cdf66417f3bddb753f0e18">
+        <source>Disable P2P from the administration interface</source>
+        <target>Wyłącz P2P z interfejsu administracyjnego</target>
+        <context-group name="null">
+          <context context-type="linenumber">94</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="efde279863678ed95a8949a3712c99748bdabfe6">
+        <source>An automatic video redundancy program: we wouldn't know if the IP downloaded the video on purpose or if it was the automatized program</source>
+        <context-group name="null">
+          <context context-type="linenumber">95</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="a835d8a12e14eb96919245a0bbafd8069c146578">
        <source><x id="INTERPOLATION" equiv-text="{{ account.followersCount }}"/> subscribers</source>
        <target><x id="INTERPOLATION" equiv-text="{{ account.followersCount }}"/> subskrybentów</target>
@@ -424,6 +732,12 @@
          <context context-type="linenumber">21</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="554488d11165f38b27b8fe230aba8a2e30d57003">
+        <source>Default client route</source>
+        <context-group name="null">
+          <context context-type="linenumber">54</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="1cbeb1eb589bfbe5efce94184cacd3095ca26948">
        <source>Videos Trending</source>
        <target>Filmy na czasie</target>
@@ -543,6 +857,13 @@
          <context context-type="linenumber">141</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="6e671e839ca889feef0d8ed525d1a44b4b10870c">
+        <source>Indicates the Twitter account for the website or platform on which the content was published.</source>
+        <target>Oznacza konto Twittera dla strony lub platformy na której została opublikowana zawartość.</target>
+        <context-group name="null">
+          <context context-type="linenumber">144</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="c0716c28b9d4c9e0b2fd6031334394214e5f9605">
        <source>Instance whitelisted by Twitter</source>
        <target>Instancja jest na białej liście Twittera</target>
@@ -584,7 +905,7 @@ Zaznacz ten element, zapisz konfigurację i przetestuj odnośnik do filmu z tej
      </trans-unit>
      <trans-unit id="6ef2ab819d4441fa8bddf6759b6936783d06616f">
        <source>If you disable transcoding, many videos from your users will not work!</source>
-        <target>Jeżeli wyłączysz transkodowanie, wiele filmów od użytkowników może nie działać</target>
+        <target>Jeżeli wyłączysz transkodowanie, wiele filmów od użytkowników może nie działać!</target>
        <context-group name="null">
          <context context-type="linenumber">180</context>
        </context-group>
@@ -694,6 +1015,13 @@ Zaznacz ten element, zapisz konfigurację i przetestuj odnośnik do filmu z tej
          <context context-type="linenumber">276</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="3e459b5c3861d8c80084d21d233b7c8e2edd3cca">
+        <source>It seems the configuration is invalid. Please search potential errors in the different tabs.</source>
+        <target>Wygląda na to, że konfiguracja jest nieprawidłowa. Poszukaj możliwych błędów w innych kartach.</target>
+        <context-group name="null">
+          <context context-type="linenumber">277</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="80dbb8ba42b97a9ec035c0ba09f45c07ea07096c">
        <source>
      Users
@@ -806,6 +1134,12 @@ Zaznacz ten element, zapisz konfigurację i przetestuj odnośnik do filmu z tej
          <context context-type="linenumber">8</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="873b72903b1858a9cd6c8967521030b4d7d1435b">
+        <source>State</source>
+        <context-group name="null">
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="ff3173170e5b03536dd3b3e1afbae1f55356eb1b">
        <source>Created <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></source>
        <target>Utworzono <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></target>
@@ -883,6 +1217,15 @@ Zaznacz ten element, zapisz konfigurację i przetestuj odnośnik do filmu z tej
          <context context-type="linenumber">18</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="42e3c0e89177ca135974221eaf0e4e836c32e345">
+        <source>
+      Transcoding is enabled on server. The video quota only take in account <x id="START_TAG_STRONG" ctype="x-strong" equiv-text="&lt;strong&gt;"/>original<x id="CLOSE_TAG_STRONG" ctype="x-strong" equiv-text="&lt;/strong&gt;"/> video. <x id="LINE_BREAK" ctype="lb" equiv-text="&lt;br/&gt;"/>
+      At most, this user could use ~ <x id="INTERPOLATION" equiv-text="{{ computeQuotaWithTranscoding() | bytes: 0 }}"/>.
+    </source>
+        <context-group name="null">
+          <context context-type="linenumber">65</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="5e8b4663c17c337a1f11160c0a683350936faa1f">
        <source>Users list</source>
        <target>Lista użytkowników</target>
@@ -1311,7 +1654,7 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
      </trans-unit>
      <trans-unit id="3549ee96125a43181f80712ed744ee223a0e645a">
        <source>Enable video comments</source>
-        <target>Włącz komentarze do filmu.</target>
+        <target>Włącz komentarze do filmu</target>
        <context-group name="null">
          <context context-type="linenumber">126</context>
        </context-group>
@@ -1418,6 +1761,13 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
          <context context-type="linenumber">25</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="6ac01cebf6f87418b309a83d5ce965d77b4ab740">
+        <source>Torrent (magnet)</source>
+        <target>Torrent (magnet)</target>
+        <context-group name="null">
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="dc75033a5238fdc4f462212c847a45ba8018a3fd">
        <source>Download</source>
        <target>Pobierz</target>
@@ -1529,6 +1879,13 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
          <context context-type="linenumber">26</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="57075c778cf28b81272df4eb17da944366c98e51">
+        <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;@<x id="INTERPOLATION" equiv-text="{{video.account.name}}"/>@<x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/>&lt;/strong&gt; and subscribe there. Subscription as a PeerTube user is being worked on in &lt;a href='https://github.com/Chocobozzz/PeerTube/issues/470'&gt;#470&lt;/a&gt;.</source>
+        <target>Możesz zasubskrybować to konto na każdej instancji należącej do Fediwersum obsługującej ActivityPub. Na przykład, na Mastodonie lub Pleromie możesz wprowadzić w pole wyszukiwania &lt;strong&gt;@<x id="INTERPOLATION" equiv-text="{{video.account.name}}"/>@<x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/>&lt;/strong&gt; i zasubskrybować je. Subskrybowanie jako użytkownik PeerTube jest przygotowywane w &lt;a href='https://github.com/Chocobozzz/PeerTube/issues/470'&gt;#470&lt;/a&gt;.</target>
+        <context-group name="null">
+          <context context-type="linenumber">30</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="ccc07df383b7a32be3e2e105faa5488caf261c1c">
        <source>By <x id="INTERPOLATION" equiv-text="{{ video.by }}"/></source>
        <target>Od <x id="INTERPOLATION" equiv-text="{{ video.by }}"/></target>
@@ -1692,6 +2049,17 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
          <context context-type="linenumber">193</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="4c2fca29fd9d7e85abe85a206958a4226f403be2">
+        <source>
+        The sharing system used by this video implies that some technical information about your system (such as a public IP address) can be accessed publicly.
+      </source>
+        <target>
+        Technologia udostępniania używana przez ten film oznacza, że część technicznych informacji o Twoim systemie (tj. publiczny adres IP) może być dostępna dla innych.
+      </target>
+        <context-group name="null">
+          <context context-type="linenumber">195</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="e60c11e1b1dfbbeda577364b8de39ded2d796c5e">
        <source>More information</source>
        <target>Więcej informacji</target>
@@ -1728,6 +2096,12 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
          <context context-type="linenumber">3</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="da8a38f72f92714cf8680560c99982dc651480d5">
+        <source>You can either comment on the page of your instance where this video is federated with your PeerTube account, or via any ActivityPub-capable fediverse instance. For instance with Mastodon or Pleroma you can type in the search box &lt;strong&gt;@<x id="INTERPOLATION" equiv-text="{{video.account.name}}"/>@<x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/>&lt;/strong&gt; and find back the video. Direct commenting capabilities are being worked on in &lt;a href='https://github.com/Chocobozzz/PeerTube/issues/224'&gt;#224&lt;/a&gt;.</source>
+        <context-group name="null">
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="17810e68b0ba21e62e61eecfaf0a93b2c91033b4">
        <source>No comments.</source>
        <target>Brak komentarzy.</target>
@@ -1829,7 +2203,7 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
      </trans-unit>
      <trans-unit id="865bc18d22e223101ede0916967ead0abd515d0e">
        <source>This could lead to security issues or bugs if you do not understand it. </source>
-        <target>Może to spowodować błędy lub problemy z bezpieczeństwem, jeżeli tego nie rozumiesz.</target>
+        <target>Może to spowodować błędy lub problemy z bezpieczeństwem, jeżeli tego nie rozumiesz. </target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
@@ -2130,7 +2504,7 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
      </trans-unit>
      <trans-unit id="8e6d54c4f760d9e90518eef5334211c48c0b71e2">
        <source>Publication scheduled on </source>
-        <target>Publikacja zaplanowana na</target>
+        <target>Publikacja zaplanowana na </target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
@@ -2149,6 +2523,15 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="edeaa933b09690523e46977e11064e9c655d77d7">
+        <source>Cannot retrieve OAuth Client credentials: <x id="INTERPOLATION" equiv-text="{{errorText}}"/>.
+</source>
+        <target>Nie można otrzymać danych uwierzytelniających OAuth Client: <x id="INTERPOLATION" equiv-text="{{errorText}}"/>.
+</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="8d9b4f4b69108c3c9aa0f3b0dbde87786ba9b319">
        <source>Ensure you have correctly configured PeerTube (config/ directory), in particular the "webserver" section.</source>
        <target>Upewnij się, że prawidłowo skonfigurowałeś PeerTube (katalog config/), szczególnie sekcję „webserver”.</target>
@@ -2177,6 +2560,13 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="ccbf0490fb6b60d21e03bb2c9003df0ce1a58752">
+        <source>Unable to find user id or verification string.</source>
+        <target>Nie można znaleźć ID użytkownika lub kodu weryfikującego.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="b0f24b7136e551a0deba831f1525711245b31a26">
        <source>Your password has been successfully reset!</source>
        <target>Pomyślnie zresetowano hasło!</target>
@@ -2429,6 +2819,20 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="e7182e21e9566cc81c83f92727461322f71fd69b">
+        <source>Support text must be at least 3 characters long.</source>
+        <target>Tekst o wsparciu musi zawierać przynajmniej 3 znaki.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3fe80c71378e127dda2dda9dbcd66b059d362813">
+        <source>Support text cannot be more than 500 characters long.</source>
+        <target>Tekst o wsparciu nie może być dłuższy niż 500 znaków.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="6ca60e0f6dfbc0073b0514bce7d273150b0b9e79">
        <source>Comment is required.</source>
        <target>Komentarz jest wymagany.</target>
@@ -2513,6 +2917,18 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="665092574f9af9fec262f8349b67b14192391ae6">
+        <source>Video support must be at least 3 characters long.</source>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e61f1c05121fa5effa6ccddf5be6dcf1c822ff4b">
+        <source>Video support cannot be more than 500 characters long.</source>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="453413bf387dea681958871319bab489dd5e6ec0">
        <source>A date is required to schedule video update.</source>
        <target>Data jest wymagana, aby zaplanować aktualizację filmu.</target>
@@ -2858,7 +3274,7 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
      </trans-unit>
      <trans-unit id="8fb519ba47ea7806beeacdcd44829d85a2aa0cc5">
        <source>yy-mm-dd </source>
-        <target>rr-mm-dd</target>
+        <target>rr-mm-dd </target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
@@ -3017,6 +3433,20 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="7296e9f7cc4956b6d57c541728b0826e76d108ba">
+        <source>~ <x id="INTERPOLATION" equiv-text="{{minutes}}"/> <x id="ICU" equiv-text="{minutes, plural, =1 {...} other {...}}"/></source>
+        <target>~ <x id="INTERPOLATION" equiv-text="{{minutes}}"/> <x id="ICU" equiv-text="{minutes, plural, =1 {...} other {...}}"/></target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cf9ddbb55b25178660e09346209aedc10108aa24">
+        <source>{VAR_PLURAL, plural, =1 {minute} other {minutes} }</source>
+        <target>{VAR_PLURAL, plural, =1 {minuta} few {minuty} other {minut} }</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="10ffa5c3dbcee491d66f80d8d4dce3e119a6ec86">
        <source><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of full HD videos</source>
        <target><x id="INTERPOLATION" equiv-text="{{seconds}}"/> filmów full HD</target>
@@ -3038,6 +3468,13 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="6d0fdbf0a14c9ac51e12b52f8781152ba5c87793">
+        <source>This image is too large.</source>
+        <target>Obraz jest zbyt wielki.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="1e876f14d96cdf3b334c080fe795a2e0ab53aa3a">
        <source>Your video was uploaded in your account and is private.</source>
        <target>Twój film został wysłany na Twoje konto i jest prywatny.</target>
@@ -3080,6 +3517,13 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="d31d39e8ee9b2f20bffb3468ee062eaa5409c59f">
+        <source>Your video quota is exceeded with this video (video size: <x id="INTERPOLATION" equiv-text="{{ videoSize }}"/>, used: <x id="INTERPOLATION_1" equiv-text="{{ videoQuotaUsed }}"/>, quota: <x id="INTERPOLATION_2" equiv-text="{{ videoQuota }}"/>)</source>
+        <target>Twoja powierzchnia na filmy została przekroczona tym filmem (rozmiar filmu: <x id="INTERPOLATION" equiv-text="{{ videoSize }}"/>, used: <x id="INTERPOLATION_1" equiv-text="{{ videoQuotaUsed }}"/>, powierzchnia: <x id="INTERPOLATION_2" equiv-text="{{ videoQuota }}"/>)</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="972fc644f847cf84e4732ec012915c4cdaf865ce">
        <source>Video published.</source>
        <target>Opublikowano film.</target>
@@ -3103,7 +3547,7 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
      </trans-unit>
      <trans-unit id="fa2601e52cbf5725a13d33fe14458823b882ea50">
        <source>Video reported.</source>
-        <target>Zgłoszono film</target>
+        <target>Zgłoszono film.</target>
        <context-group name="null">
          <context context-type="linenumber">1</context>
        </context-group>
@@ -3136,6 +3580,12 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
          <context context-type="linenumber">1</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="d5a4811e15319ad9354e1b62e9ca0131192b489e">
+        <source><x id="INTERPOLATION" equiv-text="{{likesNumber}}"/> likes / <x id="INTERPOLATION_1" equiv-text="{{dislikesNumber}}"/> dislikes</source>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="4a400b174208188dcb46f2c23f4af9accfabaa3f">
        <source>Cannot fetch video from server, maybe down.</source>
        <target>Nie można uzyskać filmu z serwera, może być niedostępny.</target>
diff --git a/client/src/locale/target/angular_pt_BR.xml b/client/src/locale/target/angular_pt_BR.xml
index 73853d6e7..73af84038 100644
--- a/client/src/locale/target/angular_pt_BR.xml
+++ b/client/src/locale/target/angular_pt_BR.xml
@@ -3,6 +3,24 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.1" xmlns:xyz="urn:appInfo:Items" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" version="1.1">
  <file source-language="en-US" datatype="plaintext" original="" target-language="pt-BR">
    <body>
+      <trans-unit id="17a9d3860d9ad593dd09a9f934e03999d9e76a7a">
+        <source>
+            Cancel
+          </source>
+        <target>
+            Cancelar
+          </target>
+        <context-group name="null">
+          <context context-type="linenumber">40</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9d5f16f0233b39fa2cd843321407a7358c323ad8">
+        <source><x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views</source>
+        <target><x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> visualizações</target>
+        <context-group name="null">
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
        <source>Edit</source>
        <target>Editar</target>
@@ -10,6 +28,13 @@
          <context context-type="linenumber">3</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="961a134583d6256df39fbc520d020ebc48e3128d">
+        <source>Truncated preview</source>
+        <target>Pré-visualização truncada</target>
+        <context-group name="null">
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="f82f53a2544638939a8ba93c0fb1b0a4419c3196">
        <source>Complete preview</source>
        <target>Pré-visualização completa</target>
@@ -28,7 +53,9 @@
        <source>
    Login
  </source>
-        <target>Iniciar sessão</target>
+        <target>
+    Iniciar sessão
+  </target>
        <context-group name="null">
          <context context-type="linenumber">2</context>
        </context-group>
@@ -58,6 +85,24 @@
          <context context-type="linenumber">16</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="d6290381021b16febc426d3e3a52dda83991ce0b">
+        <source>
+          or create an account on another instance
+        </source>
+        <target>
+          ou crie uma conta em outra instância
+        </target>
+        <context-group name="null">
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="76e1f485e6ead4c84b606f46d413878881d66ad3">
+        <source>User registration is not allowed on this instance, but you can register on many others!</source>
+        <target>Registro de novos usuários não está permitida nesta instância, porém você pode registrar em muitas outras!</target>
+        <context-group name="null">
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="c32ef07f8803a223a83ed17024b38e8d82292407">
        <source>Password</source>
        <target>Senha</target>
@@ -72,6 +117,13 @@
          <context context-type="linenumber">42</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="d2eb6c5d41f70d4b8c0937e7e19e196143b47681">
+        <source>Forgot your password</source>
+        <target>Esqueceu sua senha</target>
+        <context-group name="null">
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
      <trans-unit id="244aae9346da82b0922506c2d2581373a15641cc">
        <source>Email</source>
        <target>E-mail</target>
@@ -86,5 +138,626 @@
          <context context-type="linenumber">66</context>
        </context-group>
      </trans-unit>
+      <trans-unit id="78be69e4d26b3b654c49962839d8545e61bf8b55">
+        <source>Send me an email to reset my password</source>
+        <target>Me envie um e-mail para redefinir minha senha</target>
+        <context-group name="null">
+          <context context-type="linenumber">77</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2ba14c37f3b23553b2602c5e535d0ff4916f24aa">
+        <source>
+    Reset my password
+  </source>
+        <target>
+    Redefinir minha senha
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7f3bdcce4b2e8c37cd7f0f6c92ef8cff34b039b8">
+        <source>Confirm password</source>
+        <target>Confirme a senha</target>
+        <context-group name="null">
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3652e5c6e33165264d5271d06cc04ab7123b6df1">
+        <source>Confirmed password</source>
+        <target>Senha confirmada</target>
+        <context-group name="null">
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8bdf8db5eeeaef83184b489b80c1557b516fb3c3">
+        <source>Reset my password</source>
+        <target>Redefinir minha senha</target>
+        <context-group name="null">
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4499806949402133d08a5029cb5462c5ea25336d">
+        <source>
+    Create an account
+  </source>
+        <target>
+    Criar conta
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a6807b834e01ce165aa61fad157b0ff4288b6bf1">
+        <source>Initial video quota:</source>
+        <target>Cota de vídeo inicial:</target>
+        <context-group name="null">
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="87b6b2c26215c5e712d3bfe4cc86ba53bc23451c">
+        <source>
+      Unlimited
+    </source>
+        <target>
+      Ilimitada
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="08c74dc9762957593b91f6eb5d65efdfc975bf48">
+        <source>Username</source>
+        <target>Nome de usuário</target>
+        <context-group name="null">
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="717a5e3574fec754fbeb348c2d5561c4d81facc4">
+        <source>Signup</source>
+        <target>Inscrever-se</target>
+        <context-group name="null">
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="aef5c45fb9c725573d20a6283492e6b80fd2ae96">
+        <source>Change the language</source>
+        <target>Alterar o idioma</target>
+        <context-group name="null">
+          <context context-type="linenumber">76</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b8ccc4f1b3f839fca9bd59e072f715fd487d540f">
+        <source>
+               My public profile
+              </source>
+        <target>
+               Meu perfil público
+              </target>
+        <context-group name="null">
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c84b721e9325c9cce20d92f4dbd66898ab5ec947">
+        <source>
+                My account
+              </source>
+        <target>
+                Minha conta
+              </target>
+        <context-group name="null">
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ba7378cdaaa60b4fee17a551b232ad3512dac17d">
+        <source>
+                Log out
+              </source>
+        <target>
+                Sair
+              </target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6765b4c916060f6bc42d9bb69e80377dbcb5e4e9">
+        <source>Login</source>
+        <target>Entrar</target>
+        <context-group name="null">
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d207cc1965ec0c29e594e0e9917f39bfc276ed87">
+        <source>Create an account</source>
+        <target>Criar uma conta</target>
+        <context-group name="null">
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a52dae09be10ca3a65da918533ced3d3f4992238">
+        <source>Videos</source>
+        <target>Vídeos</target>
+        <context-group name="null">
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b6b7986bc3721ac483baf20bc9a320529075c807">
+        <source>Trending</source>
+        <target>Tendências</target>
+        <context-group name="null">
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8d20c5f5dd30acbe71316544dab774393fd9c3c1">
+        <source>Recently added</source>
+        <target>Adicionado recentemente</target>
+        <context-group name="null">
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="eadc17c3df80143992e2d9028dead3199ae6d79d">
+        <source>Local</source>
+        <target>Local</target>
+        <context-group name="null">
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b7648e7aced164498aa843b5c4e8f2f1c36a7919">
+        <source>Administration</source>
+        <target>Administração</target>
+        <context-group name="null">
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="004b222ff9ef9dd4771b777950ca1d0e4cd4348a">
+        <source>About</source>
+        <target>Sobre</target>
+        <context-group name="null">
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8aa58cf00d949c509df91c621ab38131df0a7599">
+        <source>Search...</source>
+        <target>Pesquisar...</target>
+        <context-group name="null">
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4b3972c3e9485218508a95f7a4ce7758e3f09ced">
+        <source>Upload</source>
+        <target>Carregar</target>
+        <context-group name="null">
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c31161d1661884f54fbc5635aad5ce8d4803897e">
+        <source>No results.</source>
+        <target>Nenhum resultado.</target>
+        <context-group name="null">
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ff78f059449d44322f627d0f66df07abe476962b">
+        <source>Instance</source>
+        <target>Instância</target>
+        <context-group name="null">
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6385c357c1de58ce92c0cf618ecf9cf74b917390">
+        <source>PeerTube</source>
+        <target>PeerTube</target>
+        <context-group name="null">
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5849c589454817c1e991639d3091d8da0e8d6bd2">
+        <source>
+  About <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> instance
+</source>
+        <target>
+  Sobre a instância <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/>
+</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="eec715de352a6b114713b30b640d319fa78207a0">
+        <source>Description</source>
+        <target>Descrição</target>
+        <context-group name="null">
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="69580f2c2dbf4edf7096820ba8c393367352d774">
+        <source>Terms</source>
+        <target>Termos</target>
+        <context-group name="null">
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9c6e6db693ab265457c6578df179c65694141d27">
+        <source>User registration is allowed and</source>
+        <target>Registro de usuários não está permitida e</target>
+        <context-group name="null">
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ac324b07e7c3c972f1c33894eda02dc2917eda5e">
+        <source>
+      this instance provides a baseline quota of <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> space for the videos of its users.
+    </source>
+        <target>
+      esta instância fornece uma cota base de <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> espaço para os vídeos de seus usuários.
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a6865ec6abf6af58f808501d84c8ed6ff8ce46ae">
+        <source>
+      this instance provides unlimited space for the videos of its users.
+    </source>
+        <target>
+      esta instância fornece espaço ilimitado para os vídeos de seus usuários.
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5c856a6a233b6f6c4cc8eed46436d31d2da63fc1">
+        <source>
+    User registration is currently not allowed.
+  </source>
+        <target>
+    Registro de usuários atualmente não está permitido.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a11e3ba2c5aea841de67a3c85892bb61295e94dc">
+        <source>
+  About PeerTube
+</source>
+        <target>
+  Sobre PeerTube
+</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bd29138e1e17572596ce8f2fe61bcea6ac5fb0bf">
+        <source>PeerTube is a federated (ActivityPub) video streaming platform using P2P (WebTorrent) directly in the web browser.</source>
+        <target>PeerTube é uma plataforma federada (ActivityPub) de transmissão de vídeo que utiliza P2P (WebTorrent) diretamente no browser.</target>
+        <context-group name="null">
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c2bc16265b72b9af4a4374b805931ae03e3f73a5">
+        <source>
+    It is a free and open-source software, under the <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>AGPLv3 licence<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
+  </source>
+        <target>
+    Este é um software livre, sob a <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>licença AGPLv3<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a10308f7ac111f5b66d08af0a24fc9ddf143931a">
+        <source>
+    For more information, please visit <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>joinpeertube.org<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
+  </source>
+        <target>
+    Para mais informações por favor visite <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>joinpeertube.org<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c02493cfa08b82c468233b83069b5baff23890e1">
+        <source>P2P &amp; Privacy</source>
+        <target>P2P &amp; Privacidade</target>
+        <context-group name="null">
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cd429d53cb8f4a87879301248e38cb85f07fa9d6">
+        <source>
+    PeerTube uses the BitTorrent protocol to share bandwidth between users.
+    This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video.
+  </source>
+        <target>
+    PeerTube utiliza o protocolo BitTorrent para compartilhar a banda de Internet entre os usuários.
+    Isso significa que seu endereço IP é armazenado no rastreador BitTorrent da instância enquanto você baixa ou assiste o vídeo.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e4ce50f3019e3ebe9a479784c6cb68a31c7a8231">
+        <source>What are the consequences?</source>
+        <target>Quais são as consequências?</target>
+        <context-group name="null">
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9a612748b059ad246935df17ef4ec4e6afb43a2a">
+        <source>
+    In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video.
+    In practice, this is much more difficult because:
+  </source>
+        <target>
+    Em teoria, alguém com conhecimentos técnicos suficientes poderia criar um script para rastrear qual IP está baixando qual vídeo.
+    Na prática, isto é muito mais difícil porque:
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="64f96be62df4a95a0615b6f630ad25d6348a29d3">
+        <source>
+      An HTTP request has to be sent on each tracker for each video to spy.
+      If we want to spy all PeerTube's videos, we have to send as many requests as there are videos (so potentially a lot)
+    </source>
+        <target>
+      Uma requisição HTTP precisa ser enviada para cada rastreador de cada vídeo a ser espionado.
+      Se quizermos espionar todos os vídeos do PeerTube, nós temos que enviar tantas requisições quanto vídeos existentes (então muitas, potencialmente)
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="dd9a7a4ee66b0ff3fbb43ba8691ffcd042531611">
+        <source>
+      For each request sent, the tracker returns random peers at a limited number.
+      For instance, if there are 1000 peers in the swarm and the tracker sends only 20 peers for each request, there must be at least 50 requests sent to know every peers in the swarm
+    </source>
+        <target>
+      Para cada requisição enviada, o rastreador retorna pares aleatórios até um número limite.
+      Por exemplo, se existem 1000 pares na multidão e o rastreador envia apenas 20 pares para cada requisição, devem existir pelo menos 50 requisições enviadas para conhecer todos os nós na multidão.
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="694cf53adfc2afe8afabf713ab00fa114d5d2f8e">
+        <source>
+      Those requests have to be sent regularly to know who starts/stops watching a video. It is easy to detect that kind of behaviour
+    </source>
+        <target>
+      Aquelas requisições precisam ser enviadas regularmente para saber quem iniciou/parou de assistir um vídeo. É fácil detectar aquele tipo de comportamento
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="44bbecddbdf2aad1f4bad97cb806560553fb2ab3">
+        <source>
+      If an IP address is stored in the tracker, it doesn't mean that the person behind the IP (if this person exists) has watched the video
+    </source>
+        <target>
+      Se um endereço IP é armazenado em um rastreador isto não significa que a pessoa por trás do IP (se esta pessoa existe) assistiu o vídeo
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">47</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="fec3239a860de66c718e3442df836b692b8568c3">
+        <source>
+      The IP address is a vague information : usually, it regularly changes and can represent many persons or entities
+    </source>
+        <target>
+      O endereço IP é uma informação vaga : usualmente ele muda e pode representar muitas pessoas ou entidades
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c5e62151cca9610f4248c9616909f7acaf5e5a32">
+        <source>
+      Web peers are not directly sent by the tracker: because we use WebRTC inside the web browser, the protocol is different from classic BitTorrent.
+      When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers to forward the information to.
+      See <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>this document<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> for more information
+    </source>
+        <target>
+      Pares web não são enviados diretamente pelo rastreador: por utilizarmos WebRTC dentro do navegador web, o protocolo é diferente do BitTorrent clássico.
+      Quando você está em um navegador web, você envia um sinal contendo seu endereço IP para o rastreador que escolherá outros pares para encaminhá-los a informação.
+      Veja <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>este documento<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> para mais informações
+    </target>
+        <context-group name="null">
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="50d8e8388f5ceab292850ed828f306c9f2cab389">
+        <source>
+    The worst-case scenario of an average person spying on their friends is quite unlikely.
+    There are much more effective ways to get that kind of information.
+  </source>
+        <target>
+    O cenário de pior caso de uma pessoa comum espionando seus amigos é muito improvável.
+    Existem meios mais efetivos de obtenção daquele tipo de informação.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">62</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b7801222ec2b04de2f61d3ff01d18a04bfa17505">
+        <source>How does PeerTube compares to YouTube?</source>
+        <target>Como o PeerTube se compara com o YouTube?</target>
+        <context-group name="null">
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2432705cbabcb92a8677338901dd5d655383ef4c">
+        <source>
+    The threats to privacy in YouTube are different from PeerTube's.
+    In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you.
+    Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics).
+  </source>
+        <target>
+    As ameaças à privacidade no YouTube são diferentes às do PeerTube.
+    No caso do YouTube, a plataforma coleta uma grande quantidade dos seus dados pessoais (não apenas seu IP) para analizá-los e rastrear você.
+    Além disso, YouTube é propriedade do Google/Alphabet, uma empresa que rastreia você através de muitos sítios (via AdSense ou Google Analytics).
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">69</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3c2990d5e452bdf2317ff23745db70705d848d99">
+        <source>What can I do to limit the exposure of my IP address?</source>
+        <target>O que eu posso fazer para restringir a exposição do meu endereço IP?</target>
+        <context-group name="null">
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a545356de272b955258c2a2432b08ec637b65f7e">
+        <source>
+    Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing your IP in their connection logs: ISP/routers/trackers/CDN and more.
+    PeerTube is transparent about it: we warn you that if you want to keep your IP private, you must use a VPN or Tor Browser.
+    Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense.
+  </source>
+        <target>
+    Seu endereço IP é público por isso toda vez que você consulta um sítio web existe um número de atores (além do sítio web destino) visualizando seu IP nos seus logs de conexão: ISP/roteadores/rastreadores/CDN e outros.
+    PeerTube é transparente quanto a isso: nós lhe avisamos que se você desejar manter privado o seu endereço IP, você deve utilizar uma VPN ou o Navegador Tor.
+    Imaginar que removendo o P2P do PeerTube lhe devolverá a anonimidade, não faz sentido.
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">77</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8ce78dd287b9a9dde5079916425ea66466530e41">
+        <source>What will be done to mitigate this problem?</source>
+        <target>O que será feito para mitigar o problema?</target>
+        <context-group name="null">
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d8f1c6b816aaf1ebcb936a705dbe88bcef28eaa8">
+        <source>
+    PeerTube is only in beta, and want to deliver the best countermeasures possible by the time the stable is released.
+    In the meantime, we want to test different ideas related to this issue:
+  </source>
+        <target>
+    PeerTube está apenas em versão beta, e deseja entregar as melhores contramedidas possíveis enquanto a versão estável é disponibilizada.
+    Enquanto isso, queremos testar diferentes ideias relacionadas a essa questão:
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d32608aba08c6bb3cc4e4e8ec6223e5f4e78ca19">
+        <source>Set a limit to the number of peers sent by the tracker</source>
+        <target>Defina um limite para o número de pares enviados pelo rastreador</target>
+        <context-group name="null">
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a6d732b614143f862e69798046dc0868716547e5">
+        <source>Set a limit on the request frequency received by the tracker (being tested)</source>
+        <target>Defina um limite para a frequência de requisições recebidas pelo rastreador (sendo testado)</target>
+        <context-group name="null">
+          <context context-type="linenumber">92</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ba77e356eaa5c06caaf5c8734c361d1a5415fe1c">
+        <source>Ring a bell if there are unusual requests (being tested)</source>
+        <target>Tocar um som se houverem requisições incomuns (em teste)</target>
+        <context-group name="null">
+          <context context-type="linenumber">93</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="81861ff8a71c8a5881cdf66417f3bddb753f0e18">
+        <source>Disable P2P from the administration interface</source>
+        <target>Desabilite P2P a partir da interface de administração</target>
+        <context-group name="null">
+          <context context-type="linenumber">94</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a835d8a12e14eb96919245a0bbafd8069c146578">
+        <source><x id="INTERPOLATION" equiv-text="{{ account.followersCount }}"/> subscribers</source>
+        <target><x id="INTERPOLATION" equiv-text="{{ account.followersCount }}"/> inscritos</target>
+        <context-group name="null">
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6f5a458f827503ac7b8697688ecf3e0490818ee8">
+        <source>Video channels</source>
+        <target>Canais de vídeo</target>
+        <context-group name="null">
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="299f97b8ee9c62d45f2cc01961aa1e5101d6d05a">
+        <source>Stats</source>
+        <target>Estatísticas</target>
+        <context-group name="null">
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8bc634cd9d8c9b684dbfaaf17a522f894bedbffc">
+        <source>Joined <x id="INTERPOLATION" equiv-text="{{ account.createdAt | date }}"/></source>
+        <target>Ingressou <x id="INTERPOLATION" equiv-text="{{ account.createdAt | date }}"/></target>
+        <context-group name="null">
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8fef247fd0c5bf790151f7661cafc4b7fd0397f3">
+        <source><x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount }}"/> subscribers</source>
+        <target><x id="INTERPOLATION" equiv-text="{{ videoChannel.followersCount }}"/> inscritos</target>
+        <context-group name="null">
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f36bd6a1570cb9b0a5023870f35160957cad2a8f">
+        <source>See this video channel</source>
+        <target>Veja este canal de vídeo</target>
+        <context-group name="null">
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cff1428d10d59d14e45edec3c735a27b5482db59">
+        <source>Name</source>
+        <target>Nome</target>
+        <context-group name="null">
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="512b045163a7187b2fc5d554e5f59fb3e49e174b">
+        <source>Short description</source>
+        <target>Descrição curta</target>
+        <context-group name="null">
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="554488d11165f38b27b8fe230aba8a2e30d57003">
+        <source>Default client route</source>
+        <target>Rota padrão do cliente</target>
+        <context-group name="null">
+          <context context-type="linenumber">54</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ed013c2c29216501c688e9cb5f3a1c9fd9147b71">
+        <source>This video contains mature or explicit content. Are you sure you want to watch it?</source>
+        <target>Este vídeo possui conteúdo adulto ou explícito. Você tem certeza que deseja assistí-lo?</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5ba3d522e4146eefcbd5c222247c1e2423d27cd8">
+        <source>Mature or explicit content</source>
+        <target>Conteúdo adulto ou explícito</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7e892ba15f2c6c17e83510e273b3e10fc32ea016">
+        <source>Search</source>
+        <target>Pesquisar</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
    </body>
  </file></xliff>
 \ No newline at end of file
diff --git a/client/src/locale/target/angular_zh_Hant_TW.xml b/client/src/locale/target/angular_zh_Hant_TW.xml
new file mode 100644
index 000000000..870c46855
--- /dev/null
+++ b/client/src/locale/target/angular_zh_Hant_TW.xml
@@ -0,0 +1,625 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--XLIFF document generated by Zanata. Visit http://zanata.org for more infomation.-->
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.1" xmlns:xyz="urn:appInfo:Items" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" version="1.1">
+  <file source-language="en-US" datatype="plaintext" original="" target-language="zh-Hant-TW">
+    <body>
+      <trans-unit id="17a9d3860d9ad593dd09a9f934e03999d9e76a7a">
+        <source>
+            Cancel
+          </source>
+        <target>
+            取消
+          </target>
+        <context-group name="null">
+          <context context-type="linenumber">40</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9d5f16f0233b39fa2cd843321407a7358c323ad8">
+        <source><x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> views</source>
+        <target><x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> 次檢視</target>
+        <context-group name="null">
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="28f86ffd419b869711aa13f5e5ff54be6d70731c">
+        <source>Edit</source>
+        <target>編輯</target>
+        <context-group name="null">
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="961a134583d6256df39fbc520d020ebc48e3128d">
+        <source>Truncated preview</source>
+        <target>截取預覽</target>
+        <context-group name="null">
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="f82f53a2544638939a8ba93c0fb1b0a4419c3196">
+        <source>Complete preview</source>
+        <target>完整預覽</target>
+        <context-group name="null">
+          <context context-type="linenumber">10</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9c71feb04c2beab559f79c41c6127815fb9c1a6f">
+        <source>Get help</source>
+        <target>取得說明</target>
+        <context-group name="null">
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="12910217fdcdbca64bee06f511639b653d5428ea">
+        <source>
+    Login
+  </source>
+        <target>
+    登入
+  </target>
+        <context-group name="null">
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e08a77594f3d89311cdf6da5090044270909c194">
+        <source>User</source>
+        <target>使用者</target>
+        <context-group name="null">
+          <context context-type="linenumber">11</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="51ef29329faccb28d94369897068897d1b3d0478">
+        <source>Username or email address</source>
+        <target>使用者名稱或電子郵件地址</target>
+        <context-group name="null">
+          <context context-type="linenumber">13</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="02c4360c2d956e74ed6bb1f71e86812af0e19b87">
+        <source>
+          or create an account
+        </source>
+        <target>
+          或建立帳號
+        </target>
+        <context-group name="null">
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d6290381021b16febc426d3e3a52dda83991ce0b">
+        <source>
+          or create an account on another instance
+        </source>
+        <target>或在其他實體上建立帳號</target>
+        <context-group name="null">
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="76e1f485e6ead4c84b606f46d413878881d66ad3">
+        <source>User registration is not allowed on this instance, but you can register on many others!</source>
+        <target>此實體上不允許使用者註冊，但您可以在其他許多實體上註冊！</target>
+        <context-group name="null">
+          <context context-type="linenumber">26</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c32ef07f8803a223a83ed17024b38e8d82292407">
+        <source>Password</source>
+        <target>密碼</target>
+        <context-group name="null">
+          <context context-type="linenumber">28</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b87e81682959464211443afc3e23c506865d2eda">
+        <source>I forgot my password</source>
+        <target>我忘記我的密碼了</target>
+        <context-group name="null">
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d2eb6c5d41f70d4b8c0937e7e19e196143b47681">
+        <source>Forgot your password</source>
+        <target>忘記您的密碼</target>
+        <context-group name="null">
+          <context context-type="linenumber">59</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="244aae9346da82b0922506c2d2581373a15641cc">
+        <source>Email</source>
+        <target>電子郵件</target>
+        <context-group name="null">
+          <context context-type="linenumber">17</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="69b6ac577a19acc39fc0c22342092f327fff2529">
+        <source>Email address</source>
+        <target>電子郵件地址</target>
+        <context-group name="null">
+          <context context-type="linenumber">66</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="78be69e4d26b3b654c49962839d8545e61bf8b55">
+        <source>Send me an email to reset my password</source>
+        <target>傳送電子郵件給我以重設我的密碼</target>
+        <context-group name="null">
+          <context context-type="linenumber">77</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2ba14c37f3b23553b2602c5e535d0ff4916f24aa">
+        <source>
+    Reset my password
+  </source>
+        <target>重設我的密碼</target>
+        <context-group name="null">
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="7f3bdcce4b2e8c37cd7f0f6c92ef8cff34b039b8">
+        <source>Confirm password</source>
+        <target>確認密碼</target>
+        <context-group name="null">
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3652e5c6e33165264d5271d06cc04ab7123b6df1">
+        <source>Confirmed password</source>
+        <target>確認密碼</target>
+        <context-group name="null">
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8bdf8db5eeeaef83184b489b80c1557b516fb3c3">
+        <source>Reset my password</source>
+        <target>重設我的密碼</target>
+        <context-group name="null">
+          <context context-type="linenumber">29</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4499806949402133d08a5029cb5462c5ea25336d">
+        <source>
+    Create an account
+  </source>
+        <target>建立帳號</target>
+        <context-group name="null">
+          <context context-type="linenumber">3</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a6807b834e01ce165aa61fad157b0ff4288b6bf1">
+        <source>Initial video quota:</source>
+        <target>初始影片配額：</target>
+        <context-group name="null">
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="87b6b2c26215c5e712d3bfe4cc86ba53bc23451c">
+        <source>
+      Unlimited
+    </source>
+        <target>無限制</target>
+        <context-group name="null">
+          <context context-type="linenumber">16</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="08c74dc9762957593b91f6eb5d65efdfc975bf48">
+        <source>Username</source>
+        <target>使用者名稱</target>
+        <context-group name="null">
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="717a5e3574fec754fbeb348c2d5561c4d81facc4">
+        <source>Signup</source>
+        <target>註冊</target>
+        <context-group name="null">
+          <context context-type="linenumber">86</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="aef5c45fb9c725573d20a6283492e6b80fd2ae96">
+        <source>Change the language</source>
+        <target>變更語言</target>
+        <context-group name="null">
+          <context context-type="linenumber">76</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b8ccc4f1b3f839fca9bd59e072f715fd487d540f">
+        <source>
+               My public profile
+              </source>
+        <target>我的公開簡介</target>
+        <context-group name="null">
+          <context context-type="linenumber">19</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c84b721e9325c9cce20d92f4dbd66898ab5ec947">
+        <source>
+                My account
+              </source>
+        <target>我的帳號</target>
+        <context-group name="null">
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ba7378cdaaa60b4fee17a551b232ad3512dac17d">
+        <source>
+                Log out
+              </source>
+        <target>登出</target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6765b4c916060f6bc42d9bb69e80377dbcb5e4e9">
+        <source>Login</source>
+        <target>登入</target>
+        <context-group name="null">
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d207cc1965ec0c29e594e0e9917f39bfc276ed87">
+        <source>Create an account</source>
+        <target>建立帳號</target>
+        <context-group name="null">
+          <context context-type="linenumber">37</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a52dae09be10ca3a65da918533ced3d3f4992238">
+        <source>Videos</source>
+        <target>影片</target>
+        <context-group name="null">
+          <context context-type="linenumber">21</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b6b7986bc3721ac483baf20bc9a320529075c807">
+        <source>Trending</source>
+        <target>趨勢</target>
+        <context-group name="null">
+          <context context-type="linenumber">45</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8d20c5f5dd30acbe71316544dab774393fd9c3c1">
+        <source>Recently added</source>
+        <target>最近新增</target>
+        <context-group name="null">
+          <context context-type="linenumber">50</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="eadc17c3df80143992e2d9028dead3199ae6d79d">
+        <source>Local</source>
+        <target>本機</target>
+        <context-group name="null">
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b7648e7aced164498aa843b5c4e8f2f1c36a7919">
+        <source>Administration</source>
+        <target>管理</target>
+        <context-group name="null">
+          <context context-type="linenumber">64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="004b222ff9ef9dd4771b777950ca1d0e4cd4348a">
+        <source>About</source>
+        <target>關於</target>
+        <context-group name="null">
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8aa58cf00d949c509df91c621ab38131df0a7599">
+        <source>Search...</source>
+        <target>搜尋……</target>
+        <context-group name="null">
+          <context context-type="linenumber">2</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4b3972c3e9485218508a95f7a4ce7758e3f09ced">
+        <source>Upload</source>
+        <target>上傳</target>
+        <context-group name="null">
+          <context context-type="linenumber">9</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c31161d1661884f54fbc5635aad5ce8d4803897e">
+        <source>No results.</source>
+        <target>沒有結果</target>
+        <context-group name="null">
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ff78f059449d44322f627d0f66df07abe476962b">
+        <source>Instance</source>
+        <target>實體</target>
+        <context-group name="null">
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="6385c357c1de58ce92c0cf618ecf9cf74b917390">
+        <source>PeerTube</source>
+        <target>PeerTube</target>
+        <context-group name="null">
+          <context context-type="linenumber">7</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5849c589454817c1e991639d3091d8da0e8d6bd2">
+        <source>
+  About <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> instance
+</source>
+        <target>關於 <x id="INTERPOLATION" equiv-text="{{ instanceName }}"/> 實體</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="eec715de352a6b114713b30b640d319fa78207a0">
+        <source>Description</source>
+        <target>描述</target>
+        <context-group name="null">
+          <context context-type="linenumber">23</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="69580f2c2dbf4edf7096820ba8c393367352d774">
+        <source>Terms</source>
+        <target>條款</target>
+        <context-group name="null">
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9c6e6db693ab265457c6578df179c65694141d27">
+        <source>User registration is allowed and</source>
+        <target>允許使用者註冊與</target>
+        <context-group name="null">
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ac324b07e7c3c972f1c33894eda02dc2917eda5e">
+        <source>
+      this instance provides a baseline quota of <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/> space for the videos of its users.
+    </source>
+        <target>此實體提供了基本配額 <x id="INTERPOLATION" equiv-text="{{ userVideoQuota | bytes: 0 }}"/>  空間給它的使用者的影片。</target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a6865ec6abf6af58f808501d84c8ed6ff8ce46ae">
+        <source>
+      this instance provides unlimited space for the videos of its users.
+    </source>
+        <target>此實體提供了無限的影片空間給它的使用者。</target>
+        <context-group name="null">
+          <context context-type="linenumber">31</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5c856a6a233b6f6c4cc8eed46436d31d2da63fc1">
+        <source>
+    User registration is currently not allowed.
+  </source>
+        <target>目前不允許使用者註冊。</target>
+        <context-group name="null">
+          <context context-type="linenumber">36</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a11e3ba2c5aea841de67a3c85892bb61295e94dc">
+        <source>
+  About PeerTube
+</source>
+        <target>關於 PeerTube</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="bd29138e1e17572596ce8f2fe61bcea6ac5fb0bf">
+        <source>PeerTube is a federated (ActivityPub) video streaming platform using P2P (WebTorrent) directly in the web browser.</source>
+        <target>PeerTube 是一個聯盟式 (ActivityPub) 的影片串流平臺，直接在網頁瀏覽器中使用 P2P (WebTorrent)</target>
+        <context-group name="null">
+          <context context-type="linenumber">6</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c2bc16265b72b9af4a4374b805931ae03e3f73a5">
+        <source>
+    It is a free and open-source software, under the <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>AGPLv3 licence<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
+  </source>
+        <target>它是自由與開放原始碼軟體，以 <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>AGPLv3<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> 授權。</target>
+        <context-group name="null">
+          <context context-type="linenumber">8</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a10308f7ac111f5b66d08af0a24fc9ddf143931a">
+        <source>
+    For more information, please visit <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>joinpeertube.org<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>.
+  </source>
+        <target>要取得更多資訊，請造訪 <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>joinpeertube.org<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>。</target>
+        <context-group name="null">
+          <context context-type="linenumber">12</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c02493cfa08b82c468233b83069b5baff23890e1">
+        <source>P2P &amp; Privacy</source>
+        <target>P2P 與隱私</target>
+        <context-group name="null">
+          <context context-type="linenumber">18</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="cd429d53cb8f4a87879301248e38cb85f07fa9d6">
+        <source>
+    PeerTube uses the BitTorrent protocol to share bandwidth between users.
+    This implies that your IP address is stored in the instance's BitTorrent tracker as long as you download or watch the video.
+  </source>
+        <target>PeerTube 使用了 BitTorrent 協定以與使用者分享頻寬。
+這代表了只要您下載或觀看影片，您的 IP 位置就會儲存在實體的 BitTorrent tracker 中。</target>
+        <context-group name="null">
+          <context context-type="linenumber">20</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="e4ce50f3019e3ebe9a479784c6cb68a31c7a8231">
+        <source>What are the consequences?</source>
+        <target>有什麼後果？</target>
+        <context-group name="null">
+          <context context-type="linenumber">25</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="9a612748b059ad246935df17ef4ec4e6afb43a2a">
+        <source>
+    In theory, someone with enough technical skills could create a script that tracks which IP is downloading which video.
+    In practice, this is much more difficult because:
+  </source>
+        <target>理論上，有足夠技術能力的人可能會編寫指令稿來追蹤哪些 IP 下載了哪些影片。
+不過實際上，這並沒有那麼簡單，因為：</target>
+        <context-group name="null">
+          <context context-type="linenumber">27</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="64f96be62df4a95a0615b6f630ad25d6348a29d3">
+        <source>
+      An HTTP request has to be sent on each tracker for each video to spy.
+      If we want to spy all PeerTube's videos, we have to send as many requests as there are videos (so potentially a lot)
+    </source>
+        <target>必須對每個 tracker 都發送一個 HTTP request 才能監視。
+若我們想要監視所有 PeerTube 的影片，我們必須送出與總影片數一樣多的 request（所以可能會非常多）</target>
+        <context-group name="null">
+          <context context-type="linenumber">33</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="dd9a7a4ee66b0ff3fbb43ba8691ffcd042531611">
+        <source>
+      For each request sent, the tracker returns random peers at a limited number.
+      For instance, if there are 1000 peers in the swarm and the tracker sends only 20 peers for each request, there must be at least 50 requests sent to know every peers in the swarm
+    </source>
+        <target>每個 request 送出後，tracker 會以有限的數量回傳隨機 peers。
+舉例來說，如果群組中有 1000 個 peers，而 tracker 只會對每個請求傳送 20 個 peers，則必須至少發送 50 個請求以知道在群組中的每個 peers</target>
+        <context-group name="null">
+          <context context-type="linenumber">38</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="694cf53adfc2afe8afabf713ab00fa114d5d2f8e">
+        <source>
+      Those requests have to be sent regularly to know who starts/stops watching a video. It is easy to detect that kind of behaviour
+    </source>
+        <target>那些請求必須有規律的傳送以得知誰開始／停止觀看影片。這種行為很容易偵測。</target>
+        <context-group name="null">
+          <context context-type="linenumber">43</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="44bbecddbdf2aad1f4bad97cb806560553fb2ab3">
+        <source>
+      If an IP address is stored in the tracker, it doesn't mean that the person behind the IP (if this person exists) has watched the video
+    </source>
+        <target>若 IP 位置儲存在 tracker 中，它並不代表在 IP 後的人（如果這個人存在）已經觀看了影片。</target>
+        <context-group name="null">
+          <context context-type="linenumber">47</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="fec3239a860de66c718e3442df836b692b8568c3">
+        <source>
+      The IP address is a vague information : usually, it regularly changes and can represent many persons or entities
+    </source>
+        <target>IP 位置是模糊的資訊：通常它會定期變更，而且可能代表了許多人或實體</target>
+        <context-group name="null">
+          <context context-type="linenumber">51</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="c5e62151cca9610f4248c9616909f7acaf5e5a32">
+        <source>
+      Web peers are not directly sent by the tracker: because we use WebRTC inside the web browser, the protocol is different from classic BitTorrent.
+      When you are in a web browser, you send a signal containing your IP address to the tracker that will randomly choose other peers to forward the information to.
+      See <x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>this document<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> for more information
+    </source>
+        <target>網路 peers 不會直接被 tracker 傳送：因為我們在網路瀏覽器中使用 WebRTC，其協定不同於傳統的 BitTorrent。
+當您在網路瀏覽器中，您會傳送包含您的 IP 位置的訊號給 tracker，這將會隨機選擇要傳送給哪個 peers。
+請見<x id="START_LINK" ctype="x-a" equiv-text="&lt;a&gt;"/>這份文件<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>以取得更多資訊</target>
+        <context-group name="null">
+          <context context-type="linenumber">55</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="50d8e8388f5ceab292850ed828f306c9f2cab389">
+        <source>
+    The worst-case scenario of an average person spying on their friends is quite unlikely.
+    There are much more effective ways to get that kind of information.
+  </source>
+        <target>普通人監視他們的朋友的最壞狀況是不太可能發生的。
+要取得這種資訊有更多更有效的方法。</target>
+        <context-group name="null">
+          <context context-type="linenumber">62</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="b7801222ec2b04de2f61d3ff01d18a04bfa17505">
+        <source>How does PeerTube compares to YouTube?</source>
+        <target>PeerTube 與 YouTube 相比如何？</target>
+        <context-group name="null">
+          <context context-type="linenumber">67</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="2432705cbabcb92a8677338901dd5d655383ef4c">
+        <source>
+    The threats to privacy in YouTube are different from PeerTube's.
+    In YouTube's case, the platform gathers a huge amount of your personal information (not only your IP) to analyze them and track you.
+    Moreover, YouTube is owned by Google/Alphabet, a company that tracks you across many websites (via AdSense or Google Analytics).
+  </source>
+        <target>YouTube 中的隱私威脅與 PeerTube 的不同。
+在 YouTube 的狀況中，平臺會收集您的大量個人資訊（不僅是您的 IP）以分析它們並追蹤您。
+此外，YouTube 是 Google/Alphabet 所有，該公司會透過多個網站（透過 AdSense 或 Google Analytics）追蹤您。</target>
+        <context-group name="null">
+          <context context-type="linenumber">69</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="3c2990d5e452bdf2317ff23745db70705d848d99">
+        <source>What can I do to limit the exposure of my IP address?</source>
+        <target>我要如何限制才能讓我的 IP 位置不曝光？</target>
+        <context-group name="null">
+          <context context-type="linenumber">75</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a545356de272b955258c2a2432b08ec637b65f7e">
+        <source>
+    Your IP address is public so every time you consult a website, there is a number of actors (in addition to the final website) seeing your IP in their connection logs: ISP/routers/trackers/CDN and more.
+    PeerTube is transparent about it: we warn you that if you want to keep your IP private, you must use a VPN or Tor Browser.
+    Thinking that removing P2P from PeerTube will give you back anonymity doesn't make sense.
+  </source>
+        <target>您的 IP 位置是公開的，因此在您每次連上一個網頁時，都會有許多參與者（除了最終的網站以外還有）可以在他們的連線紀錄中看到您的 IP：ISP／路由器／tracker／CDN 等等。</target>
+        <context-group name="null">
+          <context context-type="linenumber">77</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="8ce78dd287b9a9dde5079916425ea66466530e41">
+        <source>What will be done to mitigate this problem?</source>
+        <target>可以做哪些事情來緩解此問題？</target>
+        <context-group name="null">
+          <context context-type="linenumber">83</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d8f1c6b816aaf1ebcb936a705dbe88bcef28eaa8">
+        <source>
+    PeerTube is only in beta, and want to deliver the best countermeasures possible by the time the stable is released.
+    In the meantime, we want to test different ideas related to this issue:
+  </source>
+        <target>PeerTube 還在測試階段，希望能在穩定版釋出時提供最佳對策。
+與此同時，我們想測試關於此問題的不同想法：</target>
+        <context-group name="null">
+          <context context-type="linenumber">85</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d32608aba08c6bb3cc4e4e8ec6223e5f4e78ca19">
+        <source>Set a limit to the number of peers sent by the tracker</source>
+        <target>設定透過 tracker 傳送的 peer 數量限制</target>
+        <context-group name="null">
+          <context context-type="linenumber">91</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="a6d732b614143f862e69798046dc0868716547e5">
+        <source>Set a limit on the request frequency received by the tracker (being tested)</source>
+        <target>設定透過 tracker 接收的請求頻率限制（正在測試）</target>
+        <context-group name="null">
+          <context context-type="linenumber">92</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="ba77e356eaa5c06caaf5c8734c361d1a5415fe1c">
+        <source>Ring a bell if there are unusual requests (being tested)</source>
+        <target>如果有異常請求時響鈴（正在測試）</target>
+        <context-group name="null">
+          <context context-type="linenumber">93</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="81861ff8a71c8a5881cdf66417f3bddb753f0e18">
+        <source>Disable P2P from the administration interface</source>
+        <target>從管理介面停用 P2P</target>
+        <context-group name="null">
+          <context context-type="linenumber">94</context>
+        </context-group>
+      </trans-unit>
+    </body>
+  </file></xliff>
+\ No newline at end of file
diff --git a/client/src/locale/target/iso639_de_DE.xml b/client/src/locale/target/iso639_de_DE.xml
index e400d2805..42add6b6c 100644
--- a/client/src/locale/target/iso639_de_DE.xml
+++ b/client/src/locale/target/iso639_de_DE.xml
@@ -5,7 +5,7 @@
    <body>
      <trans-unit id="Afar">
        <source>Afar</source>
-        <target>Danakil-Sprache</target>
+        <target>Afar</target>
      </trans-unit>
      <trans-unit id="Abkhazian">
        <source>Abkhazian</source>
@@ -17,7 +17,7 @@
      </trans-unit>
      <trans-unit id="Akan">
        <source>Akan</source>
-        <target>Akan-Sprache</target>
+        <target>Akan</target>
      </trans-unit>
      <trans-unit id="Amharic">
        <source>Amharic</source>
@@ -33,7 +33,7 @@
      </trans-unit>
      <trans-unit id="American Sign Language">
        <source>American Sign Language</source>
-        <target>Amerikanische Zeichensprache</target>
+        <target>Amerikanische Gebärdensprache</target>
      </trans-unit>
      <trans-unit id="Assamese">
        <source>Assamese</source>
@@ -45,7 +45,7 @@
      </trans-unit>
      <trans-unit id="Aymara">
        <source>Aymara</source>
-        <target>Aymará-Sprache</target>
+        <target>Aymara</target>
      </trans-unit>
      <trans-unit id="Azerbaijani">
        <source>Azerbaijani</source>
@@ -57,7 +57,7 @@
      </trans-unit>
      <trans-unit id="Bambara">
        <source>Bambara</source>
-        <target>Bambara-Sprache</target>
+        <target>Bambara</target>
      </trans-unit>
      <trans-unit id="Belarusian">
        <source>Belarusian</source>
@@ -69,7 +69,7 @@
      </trans-unit>
      <trans-unit id="British Sign Language">
        <source>British Sign Language</source>
-        <target>Englisch Zeichensprache</target>
+        <target>Britische Gebärdensprache</target>
      </trans-unit>
      <trans-unit id="Bislama">
        <source>Bislama</source>
@@ -91,6 +91,10 @@
        <source>Bulgarian</source>
        <target>Bulgarisch</target>
      </trans-unit>
+      <trans-unit id="Brazilian Sign Language">
+        <source>Brazilian Sign Language</source>
+        <target>Brasilianische Gebärdensprache</target>
+      </trans-unit>
      <trans-unit id="Catalan">
        <source>Catalan</source>
        <target>Katalanisch</target>
@@ -101,7 +105,7 @@
      </trans-unit>
      <trans-unit id="Chamorro">
        <source>Chamorro</source>
-        <target>Chamorro-Sprache</target>
+        <target>Chamorro</target>
      </trans-unit>
      <trans-unit id="Chechen">
        <source>Chechen</source>
@@ -121,11 +125,15 @@
      </trans-unit>
      <trans-unit id="Cree">
        <source>Cree</source>
-        <target>Cree-Sprache</target>
+        <target>Cree</target>
+      </trans-unit>
+      <trans-unit id="Czech Sign Language">
+        <source>Czech Sign Language</source>
+        <target>Tschechische Gebärdensprache</target>
      </trans-unit>
      <trans-unit id="Chinese Sign Language">
        <source>Chinese Sign Language</source>
-        <target>Chinesiche Zeichensprache</target>
+        <target>Chinesiche Gebärdensprache</target>
      </trans-unit>
      <trans-unit id="Welsh">
        <source>Welsh</source>
@@ -143,6 +151,10 @@
        <source>Dhivehi</source>
        <target>Maledivisch</target>
      </trans-unit>
+      <trans-unit id="Danish Sign Language">
+        <source>Danish Sign Language</source>
+        <target>Dänische Gebärdensprache</target>
+      </trans-unit>
      <trans-unit id="Dzongkha">
        <source>Dzongkha</source>
        <target>Dzongkha</target>
@@ -165,7 +177,7 @@
      </trans-unit>
      <trans-unit id="Ewe">
        <source>Ewe</source>
-        <target>Ewe-Sprache</target>
+        <target>Ewe</target>
      </trans-unit>
      <trans-unit id="Faroese">
        <source>Faroese</source>
@@ -177,7 +189,7 @@
      </trans-unit>
      <trans-unit id="Fijian">
        <source>Fijian</source>
-        <target>Fidschi-Sprache</target>
+        <target>Fidschi</target>
      </trans-unit>
      <trans-unit id="Finnish">
        <source>Finnish</source>
@@ -193,7 +205,7 @@
      </trans-unit>
      <trans-unit id="French Sign Language">
        <source>French Sign Language</source>
-        <target>Französiche Zeichensprache</target>
+        <target>Französiche Gebärdensprache</target>
      </trans-unit>
      <trans-unit id="Fulah">
        <source>Fulah</source>
@@ -217,15 +229,15 @@
      </trans-unit>
      <trans-unit id="Guarani">
        <source>Guarani</source>
-        <target>Guaraní-Sprache</target>
+        <target>Guaraní</target>
      </trans-unit>
      <trans-unit id="German Sign Language">
        <source>German Sign Language</source>
-        <target>Deutsche Zeichensprache</target>
+        <target>Deutsche Gebärdensprache</target>
      </trans-unit>
      <trans-unit id="Gujarati">
        <source>Gujarati</source>
-        <target>Gujarati-Sprache</target>
+        <target>Gujarati</target>
      </trans-unit>
      <trans-unit id="Haitian">
        <source>Haitian</source>
@@ -233,7 +245,11 @@
      </trans-unit>
      <trans-unit id="Hausa">
        <source>Hausa</source>
-        <target>Haussa-Sprache</target>
+        <target>Hausa</target>
+      </trans-unit>
+      <trans-unit id="Serbo-Croatian">
+        <source>Serbo-Croatian</source>
+        <target>Serbokroatisch</target>
      </trans-unit>
      <trans-unit id="Hebrew">
        <source>Hebrew</source>
@@ -241,7 +257,7 @@
      </trans-unit>
      <trans-unit id="Herero">
        <source>Herero</source>
-        <target>Herero-Sprache</target>
+        <target>Otjiherero</target>
      </trans-unit>
      <trans-unit id="Hindi">
        <source>Hindi</source>
@@ -265,11 +281,11 @@
      </trans-unit>
      <trans-unit id="Igbo">
        <source>Igbo</source>
-        <target>Ibo-Sprache</target>
+        <target>Igbo</target>
      </trans-unit>
      <trans-unit id="Sichuan Yi">
        <source>Sichuan Yi</source>
-        <target>Lalo-Sprache</target>
+        <target>Yi</target>
      </trans-unit>
      <trans-unit id="Inuktitut">
        <source>Inuktitut</source>
@@ -301,7 +317,7 @@
      </trans-unit>
      <trans-unit id="Japanese Sign Language">
        <source>Japanese Sign Language</source>
-        <target>Japanische Zeichensprache</target>
+        <target>Japanische Gebärdensprache</target>
      </trans-unit>
      <trans-unit id="Kalaallisut">
        <source>Kalaallisut</source>
@@ -321,7 +337,7 @@
      </trans-unit>
      <trans-unit id="Kanuri">
        <source>Kanuri</source>
-        <target>Kanuri-Sprache</target>
+        <target>Kanuri</target>
      </trans-unit>
      <trans-unit id="Kazakh">
        <source>Kazakh</source>
@@ -333,11 +349,11 @@
      </trans-unit>
      <trans-unit id="Kikuyu">
        <source>Kikuyu</source>
-        <target>Kikuyu-Sprache</target>
+        <target>Kikuyu</target>
      </trans-unit>
      <trans-unit id="Kinyarwanda">
        <source>Kinyarwanda</source>
-        <target>Rwanda-Sprache</target>
+        <target>Kinyarwanda</target>
      </trans-unit>
      <trans-unit id="Kirghiz">
        <source>Kirghiz</source>
@@ -345,11 +361,11 @@
      </trans-unit>
      <trans-unit id="Komi">
        <source>Komi</source>
-        <target>Komi-Sprache</target>
+        <target>Komi</target>
      </trans-unit>
      <trans-unit id="Kongo">
        <source>Kongo</source>
-        <target>Kongo-Sprache</target>
+        <target>Kikongo</target>
      </trans-unit>
      <trans-unit id="Korean">
        <source>Korean</source>
@@ -357,7 +373,7 @@
      </trans-unit>
      <trans-unit id="Kuanyama">
        <source>Kuanyama</source>
-        <target>Kwanyama-Sprache</target>
+        <target>Kuanyama</target>
      </trans-unit>
      <trans-unit id="Kurdish">
        <source>Kurdish</source>
@@ -389,11 +405,11 @@
      </trans-unit>
      <trans-unit id="Luba-Katanga">
        <source>Luba-Katanga</source>
-        <target>Luba-Katanga-Sprache</target>
+        <target>Kiluba</target>
      </trans-unit>
      <trans-unit id="Ganda">
        <source>Ganda</source>
-        <target>Ganda-Sprache</target>
+        <target>Luganda</target>
      </trans-unit>
      <trans-unit id="Marshallese">
        <source>Marshallese</source>
@@ -413,7 +429,7 @@
      </trans-unit>
      <trans-unit id="Malagasy">
        <source>Malagasy</source>
-        <target>Malagassi-Sprache</target>
+        <target>Malagassi</target>
      </trans-unit>
      <trans-unit id="Maltese">
        <source>Maltese</source>
@@ -425,7 +441,7 @@
      </trans-unit>
      <trans-unit id="Maori">
        <source>Maori</source>
-        <target>Maori-Sprache</target>
+        <target>Māori</target>
      </trans-unit>
      <trans-unit id="Malay (macrolanguage)">
        <source>Malay (macrolanguage)</source>
@@ -441,15 +457,15 @@
      </trans-unit>
      <trans-unit id="Navajo">
        <source>Navajo</source>
-        <target>Navajo-Sprache</target>
+        <target>Navajo</target>
      </trans-unit>
      <trans-unit id="South Ndebele">
        <source>South Ndebele</source>
-        <target>Ndebele-Sprache (Transvaal)</target>
+        <target>Süd-Ndebele</target>
      </trans-unit>
      <trans-unit id="North Ndebele">
        <source>North Ndebele</source>
-        <target>Ndebele-Sprache (Simbabwe)</target>
+        <target>Nord-Ndebele</target>
      </trans-unit>
      <trans-unit id="Ndonga">
        <source>Ndonga</source>
@@ -503,6 +519,10 @@
        <source>Panjabi</source>
        <target>Pandschabi-Sprache</target>
      </trans-unit>
+      <trans-unit id="Pakistan Sign Language">
+        <source>Pakistan Sign Language</source>
+        <target>Pakistanische Gebärdensprache</target>
+      </trans-unit>
      <trans-unit id="Polish">
        <source>Polish</source>
        <target>Polnisch</target>
@@ -529,7 +549,7 @@
      </trans-unit>
      <trans-unit id="Russian Sign Language">
        <source>Russian Sign Language</source>
-        <target>Russische Zeichensprache</target>
+        <target>Russische Gebärdensprache</target>
      </trans-unit>
      <trans-unit id="Rundi">
        <source>Rundi</source>
@@ -543,6 +563,14 @@
        <source>Sango</source>
        <target>Sango-Sprache</target>
      </trans-unit>
+      <trans-unit id="Saudi Arabian Sign Language">
+        <source>Saudi Arabian Sign Language</source>
+        <target>Saudi-arabische Gebärdensprache</target>
+      </trans-unit>
+      <trans-unit id="South African Sign Language">
+        <source>South African Sign Language</source>
+        <target>Südafrikanische Gebärdensprache</target>
+      </trans-unit>
      <trans-unit id="Sinhala">
        <source>Sinhala</source>
        <target>Singhalesisch</target>
@@ -611,6 +639,10 @@
        <source>Swedish</source>
        <target>Schwedisch</target>
      </trans-unit>
+      <trans-unit id="Swedish Sign Language">
+        <source>Swedish Sign Language</source>
+        <target>Schwedische Gebärdensprache</target>
+      </trans-unit>
      <trans-unit id="Tahitian">
        <source>Tahitian</source>
        <target>Tahitisch</target>
diff --git a/client/src/locale/target/iso639_es_ES.xml b/client/src/locale/target/iso639_es_ES.xml
index 0d8c4023f..0f7592584 100644
--- a/client/src/locale/target/iso639_es_ES.xml
+++ b/client/src/locale/target/iso639_es_ES.xml
@@ -3,25 +3,293 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.1" xmlns:xyz="urn:appInfo:Items" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" version="1.1">
  <file source-language="en-US" datatype="plaintext" original="" target-language="es-ES">
    <body>
+      <trans-unit id="Afrikaans">
+        <source>Afrikaans</source>
+        <target>Afrikáans</target>
+      </trans-unit>
+      <trans-unit id="Arabic">
+        <source>Arabic</source>
+        <target>Árabe</target>
+      </trans-unit>
+      <trans-unit id="Aragonese">
+        <source>Aragonese</source>
+        <target>Aragonés</target>
+      </trans-unit>
+      <trans-unit id="American Sign Language">
+        <source>American Sign Language</source>
+        <target>Lengua de signos americana</target>
+      </trans-unit>
+      <trans-unit id="Azerbaijani">
+        <source>Azerbaijani</source>
+        <target>Azerí</target>
+      </trans-unit>
+      <trans-unit id="Belarusian">
+        <source>Belarusian</source>
+        <target>Bielorruso</target>
+      </trans-unit>
+      <trans-unit id="Bengali">
+        <source>Bengali</source>
+        <target>Bengalí</target>
+      </trans-unit>
+      <trans-unit id="British Sign Language">
+        <source>British Sign Language</source>
+        <target>Lenga de signos británica</target>
+      </trans-unit>
+      <trans-unit id="Tibetan">
+        <source>Tibetan</source>
+        <target>Tibetano</target>
+      </trans-unit>
+      <trans-unit id="Bosnian">
+        <source>Bosnian</source>
+        <target>Bosnio</target>
+      </trans-unit>
      <trans-unit id="Breton">
        <source>Breton</source>
        <target>Bretón</target>
      </trans-unit>
+      <trans-unit id="Bulgarian">
+        <source>Bulgarian</source>
+        <target>Búlgaro</target>
+      </trans-unit>
+      <trans-unit id="Brazilian Sign Language">
+        <source>Brazilian Sign Language</source>
+        <target>Lengua de signos brasileña</target>
+      </trans-unit>
      <trans-unit id="Catalan">
        <source>Catalan</source>
        <target>Catalán</target>
      </trans-unit>
+      <trans-unit id="Czech">
+        <source>Czech</source>
+        <target>Checo</target>
+      </trans-unit>
+      <trans-unit id="Chechen">
+        <source>Chechen</source>
+        <target>Checheno</target>
+      </trans-unit>
+      <trans-unit id="Corsican">
+        <source>Corsican</source>
+        <target>Corso</target>
+      </trans-unit>
+      <trans-unit id="Czech Sign Language">
+        <source>Czech Sign Language</source>
+        <target>Lengua de signos checa</target>
+      </trans-unit>
+      <trans-unit id="Chinese Sign Language">
+        <source>Chinese Sign Language</source>
+        <target>Lengua de signos china</target>
+      </trans-unit>
+      <trans-unit id="Welsh">
+        <source>Welsh</source>
+        <target>Gaélico</target>
+      </trans-unit>
      <trans-unit id="German">
        <source>German</source>
        <target>Alemán</target>
      </trans-unit>
+      <trans-unit id="Danish Sign Language">
+        <source>Danish Sign Language</source>
+        <target>Lengua de signos danesa</target>
+      </trans-unit>
+      <trans-unit id="Modern Greek (1453-)">
+        <source>Modern Greek (1453-)</source>
+        <target>Griego moderno</target>
+      </trans-unit>
+      <trans-unit id="English">
+        <source>English</source>
+        <target>Inglés</target>
+      </trans-unit>
+      <trans-unit id="Estonian">
+        <source>Estonian</source>
+        <target>Estonio</target>
+      </trans-unit>
+      <trans-unit id="Basque">
+        <source>Basque</source>
+        <target>Euskera</target>
+      </trans-unit>
+      <trans-unit id="Persian">
+        <source>Persian</source>
+        <target>Persa</target>
+      </trans-unit>
+      <trans-unit id="Finnish">
+        <source>Finnish</source>
+        <target>Finés</target>
+      </trans-unit>
      <trans-unit id="French">
        <source>French</source>
        <target>Francés</target>
      </trans-unit>
+      <trans-unit id="French Sign Language">
+        <source>French Sign Language</source>
+        <target>Lengua de signos francesa</target>
+      </trans-unit>
+      <trans-unit id="Scottish Gaelic">
+        <source>Scottish Gaelic</source>
+        <target>Gaélico escocés</target>
+      </trans-unit>
+      <trans-unit id="Irish">
+        <source>Irish</source>
+        <target>Irlandés</target>
+      </trans-unit>
+      <trans-unit id="Galician">
+        <source>Galician</source>
+        <target>Gallego</target>
+      </trans-unit>
+      <trans-unit id="German Sign Language">
+        <source>German Sign Language</source>
+        <target>Lengua de signos alemana</target>
+      </trans-unit>
+      <trans-unit id="Haitian">
+        <source>Haitian</source>
+        <target>Haitiano</target>
+      </trans-unit>
+      <trans-unit id="Serbo-Croatian">
+        <source>Serbo-Croatian</source>
+        <target>Serbocroata</target>
+      </trans-unit>
+      <trans-unit id="Hebrew">
+        <source>Hebrew</source>
+        <target>Hebreo</target>
+      </trans-unit>
+      <trans-unit id="Hindi">
+        <source>Hindi</source>
+        <target>Hindi</target>
+      </trans-unit>
+      <trans-unit id="Croatian">
+        <source>Croatian</source>
+        <target>Croata</target>
+      </trans-unit>
+      <trans-unit id="Hungarian">
+        <source>Hungarian</source>
+        <target>Húngaro</target>
+      </trans-unit>
+      <trans-unit id="Georgian">
+        <source>Georgian</source>
+        <target>Georgiano</target>
+      </trans-unit>
+      <trans-unit id="Korean">
+        <source>Korean</source>
+        <target>Coreano</target>
+      </trans-unit>
+      <trans-unit id="Kurdish">
+        <source>Kurdish</source>
+        <target>Kurdo</target>
+      </trans-unit>
+      <trans-unit id="Latvian">
+        <source>Latvian</source>
+        <target>Letón</target>
+      </trans-unit>
+      <trans-unit id="Lithuanian">
+        <source>Lithuanian</source>
+        <target>Lituano</target>
+      </trans-unit>
+      <trans-unit id="Luxembourgish">
+        <source>Luxembourgish</source>
+        <target>Luxemburgués</target>
+      </trans-unit>
+      <trans-unit id="Macedonian">
+        <source>Macedonian</source>
+        <target>Macedonio</target>
+      </trans-unit>
+      <trans-unit id="Nepali (macrolanguage)">
+        <source>Nepali (macrolanguage)</source>
+        <target>Nepalí</target>
+      </trans-unit>
+      <trans-unit id="Dutch">
+        <source>Dutch</source>
+        <target>Neerlandés</target>
+      </trans-unit>
+      <trans-unit id="Norwegian">
+        <source>Norwegian</source>
+        <target>Noruego</target>
+      </trans-unit>
+      <trans-unit id="Occitan (post 1500)">
+        <source>Occitan (post 1500)</source>
+        <target>Occitano</target>
+      </trans-unit>
+      <trans-unit id="Ossetian">
+        <source>Ossetian</source>
+        <target>Osetio</target>
+      </trans-unit>
+      <trans-unit id="Pakistan Sign Language">
+        <source>Pakistan Sign Language</source>
+        <target>Lengua de signos pakistaní</target>
+      </trans-unit>
+      <trans-unit id="Polish">
+        <source>Polish</source>
+        <target>Polaco</target>
+      </trans-unit>
+      <trans-unit id="Portuguese">
+        <source>Portuguese</source>
+        <target>Portugués</target>
+      </trans-unit>
+      <trans-unit id="Romansh">
+        <source>Romansh</source>
+        <target>Romanche</target>
+      </trans-unit>
+      <trans-unit id="Romanian">
+        <source>Romanian</source>
+        <target>Rumano</target>
+      </trans-unit>
+      <trans-unit id="Russian Sign Language">
+        <source>Russian Sign Language</source>
+        <target>Lengua de signos rusa</target>
+      </trans-unit>
      <trans-unit id="Russian">
        <source>Russian</source>
        <target>Ruso</target>
      </trans-unit>
+      <trans-unit id="Somali">
+        <source>Somali</source>
+        <target>Somalí</target>
+      </trans-unit>
+      <trans-unit id="Spanish">
+        <source>Spanish</source>
+        <target>Español</target>
+      </trans-unit>
+      <trans-unit id="Albanian">
+        <source>Albanian</source>
+        <target>Albano</target>
+      </trans-unit>
+      <trans-unit id="Serbian">
+        <source>Serbian</source>
+        <target>Serbio</target>
+      </trans-unit>
+      <trans-unit id="Sundanese">
+        <source>Sundanese</source>
+        <target>Sudanés</target>
+      </trans-unit>
+      <trans-unit id="Swahili (macrolanguage)">
+        <source>Swahili (macrolanguage)</source>
+        <target>Suajili</target>
+      </trans-unit>
+      <trans-unit id="Swedish">
+        <source>Swedish</source>
+        <target>Sueco</target>
+      </trans-unit>
+      <trans-unit id="Swedish Sign Language">
+        <source>Swedish Sign Language</source>
+        <target>Lengua de signos sueca</target>
+      </trans-unit>
+      <trans-unit id="Tahitian">
+        <source>Tahitian</source>
+        <target>Tahitiano</target>
+      </trans-unit>
+      <trans-unit id="Thai">
+        <source>Thai</source>
+        <target>Tailandés</target>
+      </trans-unit>
+      <trans-unit id="Turkish">
+        <source>Turkish</source>
+        <target>Turco</target>
+      </trans-unit>
+      <trans-unit id="Chinese">
+        <source>Chinese</source>
+        <target>Chino</target>
+      </trans-unit>
+      <trans-unit id="Zulu">
+        <source>Zulu</source>
+        <target>Zulú</target>
+      </trans-unit>
    </body>
  </file></xliff>
 \ No newline at end of file
diff --git a/client/src/locale/target/iso639_oc.xml b/client/src/locale/target/iso639_oc.xml
index cb83f84fb..6a6314378 100644
--- a/client/src/locale/target/iso639_oc.xml
+++ b/client/src/locale/target/iso639_oc.xml
@@ -3,6 +3,10 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.1" xmlns:xyz="urn:appInfo:Items" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" version="1.1">
  <file source-language="en-US" datatype="plaintext" original="" target-language="oc">
    <body>
+      <trans-unit id="Afar">
+        <source>Afar</source>
+        <target>Afar</target>
+      </trans-unit>
      <trans-unit id="Afrikaans">
        <source>Afrikaans</source>
        <target>Afrikaans</target>
@@ -171,5 +175,53 @@
        <source>Spanish</source>
        <target>Espanhòl</target>
      </trans-unit>
+      <trans-unit id="Turkish">
+        <source>Turkish</source>
+        <target>Turc</target>
+      </trans-unit>
+      <trans-unit id="Uzbek">
+        <source>Uzbek</source>
+        <target>Uzbec</target>
+      </trans-unit>
+      <trans-unit id="Venda">
+        <source>Venda</source>
+        <target>Venda</target>
+      </trans-unit>
+      <trans-unit id="Vietnamese">
+        <source>Vietnamese</source>
+        <target>Vietnamian</target>
+      </trans-unit>
+      <trans-unit id="Walloon">
+        <source>Walloon</source>
+        <target>Valon</target>
+      </trans-unit>
+      <trans-unit id="Wolof">
+        <source>Wolof</source>
+        <target>Wolòf</target>
+      </trans-unit>
+      <trans-unit id="Xhosa">
+        <source>Xhosa</source>
+        <target>Xhosa</target>
+      </trans-unit>
+      <trans-unit id="Yiddish">
+        <source>Yiddish</source>
+        <target>Yiddish</target>
+      </trans-unit>
+      <trans-unit id="Yoruba">
+        <source>Yoruba</source>
+        <target>Yoruba</target>
+      </trans-unit>
+      <trans-unit id="Zhuang">
+        <source>Zhuang</source>
+        <target>Zhuang</target>
+      </trans-unit>
+      <trans-unit id="Chinese">
+        <source>Chinese</source>
+        <target>Chinés</target>
+      </trans-unit>
+      <trans-unit id="Zulu">
+        <source>Zulu</source>
+        <target>Zulu</target>
+      </trans-unit>
    </body>
  </file></xliff>
 \ No newline at end of file
diff --git a/client/src/locale/target/iso639_uk_UA.xml b/client/src/locale/target/iso639_uk_UA.xml
new file mode 100644
index 000000000..313013c51
--- /dev/null
+++ b/client/src/locale/target/iso639_uk_UA.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--XLIFF document generated by Zanata. Visit http://zanata.org for more infomation.-->
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.1" xmlns:xyz="urn:appInfo:Items" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" version="1.1">
+  <file source-language="en-US" datatype="plaintext" original="" target-language="uk-UA">
+    <body>
+      <trans-unit id="Italian">
+        <source>Italian</source>
+        <target>Італійська</target>
+      </trans-unit>
+      <trans-unit id="Javanese">
+        <source>Javanese</source>
+        <target>Яванська</target>
+      </trans-unit>
+      <trans-unit id="Japanese">
+        <source>Japanese</source>
+        <target>Японська</target>
+      </trans-unit>
+      <trans-unit id="Georgian">
+        <source>Georgian</source>
+        <target>Грузинська</target>
+      </trans-unit>
+      <trans-unit id="Kazakh">
+        <source>Kazakh</source>
+        <target>Казахська</target>
+      </trans-unit>
+      <trans-unit id="Korean">
+        <source>Korean</source>
+        <target>Корейська</target>
+      </trans-unit>
+      <trans-unit id="Lao">
+        <source>Lao</source>
+        <target>Лаоська</target>
+      </trans-unit>
+      <trans-unit id="Macedonian">
+        <source>Macedonian</source>
+        <target>Македонська</target>
+      </trans-unit>
+      <trans-unit id="Mongolian">
+        <source>Mongolian</source>
+        <target>Монгольська</target>
+      </trans-unit>
+      <trans-unit id="Dutch">
+        <source>Dutch</source>
+        <target>Голландська</target>
+      </trans-unit>
+      <trans-unit id="Norwegian">
+        <source>Norwegian</source>
+        <target>Норвежська</target>
+      </trans-unit>
+      <trans-unit id="Polish">
+        <source>Polish</source>
+        <target>Польска</target>
+      </trans-unit>
+      <trans-unit id="Portuguese">
+        <source>Portuguese</source>
+        <target>Португальська</target>
+      </trans-unit>
+      <trans-unit id="Romanian">
+        <source>Romanian</source>
+        <target>Румунська</target>
+      </trans-unit>
+      <trans-unit id="Russian">
+        <source>Russian</source>
+        <target>Російська</target>
+      </trans-unit>
+      <trans-unit id="Slovak">
+        <source>Slovak</source>
+        <target>Словацька</target>
+      </trans-unit>
+      <trans-unit id="Slovenian">
+        <source>Slovenian</source>
+        <target>Словенська</target>
+      </trans-unit>
+      <trans-unit id="Somali">
+        <source>Somali</source>
+        <target>Сомалійська</target>
+      </trans-unit>
+      <trans-unit id="Spanish">
+        <source>Spanish</source>
+        <target>Іспанська</target>
+      </trans-unit>
+      <trans-unit id="Albanian">
+        <source>Albanian</source>
+        <target>Албанська</target>
+      </trans-unit>
+      <trans-unit id="Serbian">
+        <source>Serbian</source>
+        <target>Сербська</target>
+      </trans-unit>
+      <trans-unit id="Swedish">
+        <source>Swedish</source>
+        <target>Шведська</target>
+      </trans-unit>
+      <trans-unit id="Tajik">
+        <source>Tajik</source>
+        <target>Таджицька</target>
+      </trans-unit>
+      <trans-unit id="Thai">
+        <source>Thai</source>
+        <target>Тайська</target>
+      </trans-unit>
+      <trans-unit id="Turkmen">
+        <source>Turkmen</source>
+        <target>Туркменська</target>
+      </trans-unit>
+      <trans-unit id="Turkish">
+        <source>Turkish</source>
+        <target>Турецька</target>
+      </trans-unit>
+      <trans-unit id="Ukrainian">
+        <source>Ukrainian</source>
+        <target>Українська</target>
+      </trans-unit>
+      <trans-unit id="Uzbek">
+        <source>Uzbek</source>
+        <target>Узбецька</target>
+      </trans-unit>
+      <trans-unit id="Vietnamese">
+        <source>Vietnamese</source>
+        <target>В'єтнамська</target>
+      </trans-unit>
+      <trans-unit id="Chinese">
+        <source>Chinese</source>
+        <target>Китайська</target>
+      </trans-unit>
+      <trans-unit id="Zulu">
+        <source>Zulu</source>
+        <target>Зулу</target>
+      </trans-unit>
+    </body>
+  </file></xliff>
+\ No newline at end of file
diff --git a/client/src/locale/target/player_de_DE.xml b/client/src/locale/target/player_de_DE.xml
index c584fb7a1..3c3e48ffb 100644
--- a/client/src/locale/target/player_de_DE.xml
+++ b/client/src/locale/target/player_de_DE.xml
@@ -5,22 +5,23 @@
    <body>
      <trans-unit id="Audio Player">
        <source>Audio Player</source>
-        <target>Audio-player</target>
+        <target>Audio-Player</target>
      </trans-unit>
      <trans-unit id="Video Player">
        <source>Video Player</source>
-        <target>Videospieler</target>
+        <target>Video-Player</target>
      </trans-unit>
      <trans-unit id="Play">
        <source>Play</source>
-        <target>Spielen</target>
+        <target>Wiedergabe</target>
      </trans-unit>
      <trans-unit id="Pause">
        <source>Pause</source>
+        <target>Pause</target>
      </trans-unit>
      <trans-unit id="Replay">
        <source>Replay</source>
-        <target>Wiederholen</target>
+        <target>Nochmal</target>
      </trans-unit>
      <trans-unit id="Current Time">
        <source>Current Time</source>
@@ -28,13 +29,19 @@
      </trans-unit>
      <trans-unit id="Duration">
        <source>Duration</source>
+        <target>Länge</target>
      </trans-unit>
      <trans-unit id="Remaining Time">
        <source>Remaining Time</source>
-        <target>Restliche Zeit</target>
+        <target>Verbleibende Zeit</target>
+      </trans-unit>
+      <trans-unit id="Stream Type">
+        <source>Stream Type</source>
+        <target>Streamtyp</target>
      </trans-unit>
      <trans-unit id="LIVE">
        <source>LIVE</source>
+        <target>Live</target>
      </trans-unit>
      <trans-unit id="Loaded">
        <source>Loaded</source>
@@ -42,22 +49,35 @@
      </trans-unit>
      <trans-unit id="Progress">
        <source>Progress</source>
-        <target>Vorrücken</target>
+        <target>Fortschritt</target>
      </trans-unit>
      <trans-unit id="Progress Bar">
        <source>Progress Bar</source>
+        <target>Fortschrittsanzeige</target>
+      </trans-unit>
+      <trans-unit id="progress bar timing: currentTime={1} duration={2}">
+        <source>{1} of {2}</source>
+        <target>{1} von {2}</target>
      </trans-unit>
      <trans-unit id="Fullscreen">
        <source>Fullscreen</source>
        <target>Vollbildschirm</target>
      </trans-unit>
+      <trans-unit id="Non-Fullscreen">
+        <source>Non-Fullscreen</source>
+        <target>Kein Vollbildschirm</target>
+      </trans-unit>
      <trans-unit id="Mute">
        <source>Mute</source>
-        <target>stumm</target>
+        <target>Ton aus</target>
      </trans-unit>
      <trans-unit id="Unmute">
        <source>Unmute</source>
-        <target>laut</target>
+        <target>Ton ein</target>
+      </trans-unit>
+      <trans-unit id="Playback Rate">
+        <source>Playback Rate</source>
+        <target>Wiedergabegeschwindigkeit</target>
      </trans-unit>
      <trans-unit id="Subtitles">
        <source>Subtitles</source>
@@ -65,6 +85,15 @@
      </trans-unit>
      <trans-unit id="subtitles off">
        <source>subtitles off</source>
+        <target>Untertitel aus</target>
+      </trans-unit>
+      <trans-unit id="Captions">
+        <source>Captions</source>
+        <target>Untertitel für Gehörlose und Schwerhörige</target>
+      </trans-unit>
+      <trans-unit id="captions off">
+        <source>captions off</source>
+        <target>Untertitel für Gehörlose und Schwerhörige aus</target>
      </trans-unit>
      <trans-unit id="Chapters">
        <source>Chapters</source>
@@ -72,14 +101,15 @@
      </trans-unit>
      <trans-unit id="Descriptions">
        <source>Descriptions</source>
-        <target>Beschreibung</target>
+        <target>Beschreibungen</target>
      </trans-unit>
      <trans-unit id="descriptions off">
        <source>descriptions off</source>
+        <target>Beschreibungen aus</target>
      </trans-unit>
      <trans-unit id="Audio Track">
        <source>Audio Track</source>
-        <target>Audiospur</target>
+        <target>Tonspur</target>
      </trans-unit>
      <trans-unit id="Volume Level">
        <source>Volume Level</source>
@@ -87,23 +117,263 @@
      </trans-unit>
      <trans-unit id="You aborted the media playback">
        <source>You aborted the media playback</source>
-        <target>Sie haben die Mediawiedergabe aufgehört</target>
+        <target>Du hast die Medienwiedergabe abgebrochen.</target>
      </trans-unit>
      <trans-unit id="A network error caused the media download to fail part-way.">
        <source>A network error caused the media download to fail part-way.</source>
+        <target>Ein Netzwerkfehler hat das Herunterladen des Videos teilweise verhindert.</target>
      </trans-unit>
      <trans-unit id="The media could not be loaded, either because the server or network failed or because the format is not supported.">
        <source>The media could not be loaded, either because the server or network failed or because the format is not supported.</source>
-        <target>Das Media konnte nicht geladen werden, entweder wegen server- oder Netzwerkfehler, oder weil das Format nicht unterstützt wird.</target>
+        <target>Es ist ein Fehler beim Laden aufgetreten. Das kann an einer fehlenden Netzwerk-Verbindung liegen oder daran, dass das Format nicht unterstützt wird.</target>
      </trans-unit>
      <trans-unit id="The media playback was aborted due to a corruption problem or because the media used features your browser did not support.">
        <source>The media playback was aborted due to a corruption problem or because the media used features your browser did not support.</source>
+        <target>Die Medienwiedergabe wurde abgebrochen, weil die erhaltenen Daten entweder fehlerhaft sind vom aktuellen Browser nicht unterstützt werden.</target>
      </trans-unit>
      <trans-unit id="No compatible source was found for this media.">
        <source>No compatible source was found for this media.</source>
+        <target>Es konnte keine kompatible Quelle gefunden werden.</target>
      </trans-unit>
      <trans-unit id="The media is encrypted and we do not have the keys to decrypt it.">
        <source>The media is encrypted and we do not have the keys to decrypt it.</source>
+        <target>Die Daten sind verschlüsselt und es liegen keine Schlüssel dafür vor.</target>
+      </trans-unit>
+      <trans-unit id="Play Video">
+        <source>Play Video</source>
+        <target>Video abspielen</target>
+      </trans-unit>
+      <trans-unit id="Close">
+        <source>Close</source>
+        <target>Schließen</target>
+      </trans-unit>
+      <trans-unit id="Close Modal Dialog">
+        <source>Close Modal Dialog</source>
+        <target>Dialogfenster schließen</target>
+      </trans-unit>
+      <trans-unit id="Modal Window">
+        <source>Modal Window</source>
+        <target>Dialogfenster</target>
+      </trans-unit>
+      <trans-unit id="This is a modal window">
+        <source>This is a modal window</source>
+        <target>Dies ist ein Dialogfenster.</target>
+      </trans-unit>
+      <trans-unit id="This modal can be closed by pressing the Escape key or activating the close button.">
+        <source>This modal can be closed by pressing the Escape key or activating the close button.</source>
+        <target>Dieses Dialogfenster kann geschlossen werden, indem man die Escape-Taste drückt oder auf die Schaltfläche zum Schließen des Fenster klickt.</target>
+      </trans-unit>
+      <trans-unit id=", opens captions settings dialog">
+        <source>, opens captions settings dialog</source>
+        <target>, öffnet die Einstellungen für Untertitel für Gehörlose und Schwerhörige</target>
+      </trans-unit>
+      <trans-unit id=", opens subtitles settings dialog">
+        <source>, opens subtitles settings dialog</source>
+        <target>, öffnet die Einstellungen für Untertitel</target>
+      </trans-unit>
+      <trans-unit id=", opens descriptions settings dialog">
+        <source>, opens descriptions settings dialog</source>
+        <target>, öffnet die Einstellungen für Beschreibungen</target>
+      </trans-unit>
+      <trans-unit id=", selected">
+        <source>, selected</source>
+        <target>, ausgewählt</target>
+      </trans-unit>
+      <trans-unit id="captions settings">
+        <source>captions settings</source>
+        <target>Einstellungen für Untertitel für Gehörlose und Schwerhörige</target>
+      </trans-unit>
+      <trans-unit id="subtitles settings">
+        <source>subititles settings</source>
+        <target>Einstellungen für Untertitel</target>
+      </trans-unit>
+      <trans-unit id="descriptions settings">
+        <source>descriptions settings</source>
+        <target>Einstellungen für Beschreibungen</target>
+      </trans-unit>
+      <trans-unit id="Text">
+        <source>Text</source>
+        <target>Text</target>
+      </trans-unit>
+      <trans-unit id="White">
+        <source>White</source>
+        <target>Weiß</target>
+      </trans-unit>
+      <trans-unit id="Black">
+        <source>Black</source>
+        <target>Schwarz</target>
+      </trans-unit>
+      <trans-unit id="Red">
+        <source>Red</source>
+        <target>Rot</target>
+      </trans-unit>
+      <trans-unit id="Green">
+        <source>Green</source>
+        <target>Grün</target>
+      </trans-unit>
+      <trans-unit id="Blue">
+        <source>Blue</source>
+        <target>Blau</target>
+      </trans-unit>
+      <trans-unit id="Yellow">
+        <source>Yellow</source>
+        <target>Gelb</target>
+      </trans-unit>
+      <trans-unit id="Magenta">
+        <source>Magenta</source>
+        <target>Magenta</target>
+      </trans-unit>
+      <trans-unit id="Cyan">
+        <source>Cyan</source>
+        <target>Cyan</target>
+      </trans-unit>
+      <trans-unit id="Background">
+        <source>Background</source>
+        <target>Hintergrund</target>
+      </trans-unit>
+      <trans-unit id="Window">
+        <source>Window</source>
+        <target>Fenster</target>
+      </trans-unit>
+      <trans-unit id="Transparent">
+        <source>Transparent</source>
+        <target>durchsichtig</target>
+      </trans-unit>
+      <trans-unit id="Semi-Transparent">
+        <source>Semi-Transparent</source>
+        <target>halbdurchsichtig</target>
+      </trans-unit>
+      <trans-unit id="Opaque">
+        <source>Opaque</source>
+        <target>undurchsichtig</target>
+      </trans-unit>
+      <trans-unit id="Font Size">
+        <source>Font Size</source>
+        <target>Schriftgröße</target>
+      </trans-unit>
+      <trans-unit id="Text Edge Style">
+        <source>Text Edge Style</source>
+        <target>Textkantenstil</target>
+      </trans-unit>
+      <trans-unit id="None">
+        <source>None</source>
+        <target>Nichts</target>
+      </trans-unit>
+      <trans-unit id="Raised">
+        <source>Raised</source>
+        <target>Erhöht</target>
+      </trans-unit>
+      <trans-unit id="Depressed">
+        <source>Depressed</source>
+        <target>Erniedrigt</target>
+      </trans-unit>
+      <trans-unit id="Uniform">
+        <source>Uniform</source>
+        <target>Gleichmäßig</target>
+      </trans-unit>
+      <trans-unit id="Dropshadow">
+        <source>Dropshadow</source>
+        <target>Schlagschatten</target>
+      </trans-unit>
+      <trans-unit id="Font Family">
+        <source>Font Family</source>
+        <target>Schriftart</target>
+      </trans-unit>
+      <trans-unit id="Proportional Sans-Serif">
+        <source>Proportional Sans-Serif</source>
+        <target>Proportionale Grotesk</target>
+      </trans-unit>
+      <trans-unit id="Monospace Sans-Serif">
+        <source>Monospace Sans-Serif</source>
+        <target>Nichtproportionale Grotesk</target>
+      </trans-unit>
+      <trans-unit id="Proportional Serif">
+        <source>Proportional Serif</source>
+        <target>Proportionale Serifen-Schrit</target>
+      </trans-unit>
+      <trans-unit id="Monospace Serif">
+        <source>Monospace Serif</source>
+        <target>Nichtproportionale Serifen-Schrift</target>
+      </trans-unit>
+      <trans-unit id="Casual">
+        <source>Casual</source>
+        <target>Gewöhnlich</target>
+      </trans-unit>
+      <trans-unit id="Script">
+        <source>Script</source>
+        <target>Schreibschrift</target>
+      </trans-unit>
+      <trans-unit id="Small Caps">
+        <source>Small Caps</source>
+        <target>Kapitälchen</target>
+      </trans-unit>
+      <trans-unit id="Reset">
+        <source>Reset</source>
+        <target>Zurücksetzen</target>
+      </trans-unit>
+      <trans-unit id="restore all settings to the default values">
+        <source>restore all settings to the default values</source>
+        <target>Alle Einstellungen auf ihre Standardwerte zurücksetzen</target>
+      </trans-unit>
+      <trans-unit id="Done">
+        <source>Done</source>
+        <target>Fertig</target>
+      </trans-unit>
+      <trans-unit id="Caption Settings Dialog">
+        <source>Caption Settings Dialog</source>
+        <target>Dialogfenster für Einstellungen für Untertitel für Gehörlose und Schwerhörige</target>
+      </trans-unit>
+      <trans-unit id="Beginning of dialog window. Escape will cancel and close the window.">
+        <source>Beginning of dialog window. Escape will cancel and close the window.</source>
+        <target>Anfang des Dialogfensters. Mit der Escape-Taste wird das Fenster ohne Speichern geschlossen.</target>
+      </trans-unit>
+      <trans-unit id="End of dialog window.">
+        <source>End of dialog window.</source>
+        <target>Ende des Dialogfensters.</target>
+      </trans-unit>
+      <trans-unit id="{1} is loading.">
+        <source>{1} is loading.</source>
+        <target>{1} lädt.</target>
+      </trans-unit>
+      <trans-unit id="Quality">
+        <source>Quality</source>
+        <target>Qualität</target>
+      </trans-unit>
+      <trans-unit id="Auto">
+        <source>Auto</source>
+        <target>Automatische Wiedergabe</target>
+      </trans-unit>
+      <trans-unit id="Speed">
+        <source>Speed</source>
+        <target>Geschwindigkeit</target>
+      </trans-unit>
+      <trans-unit id="peers">
+        <source>peers</source>
+        <target>Peers</target>
+      </trans-unit>
+      <trans-unit id="Go to the video page">
+        <source>Go to the video page</source>
+        <target>Zur Video-Seite gehen</target>
+      </trans-unit>
+      <trans-unit id="Settings">
+        <source>Settings</source>
+        <target>Einstellungen</target>
+      </trans-unit>
+      <trans-unit id="Uses P2P, others may know you are watching this video.">
+        <source>Uses P2P, others may know you are watching this video.</source>
+        <target>Nutzt Peer-to-Peer-Technologie, daher könnten andere wissen, dass du dieses Video ansiehst.</target>
+      </trans-unit>
+      <trans-unit id="Copy the video URL">
+        <source>Copy the video URL</source>
+        <target>Video-URL kopieren</target>
+      </trans-unit>
+      <trans-unit id="Copy the video URL at the current time">
+        <source>Copy the video URL at the current time</source>
+        <target>Video-URL an dieser Stelle kopieren</target>
+      </trans-unit>
+      <trans-unit id="Copy embed code">
+        <source>Copy embed code</source>
+        <target>Einbettungscode kopieren</target>
      </trans-unit>
    </body>
  </file></xliff>
 \ No newline at end of file
diff --git a/client/src/locale/target/player_eo.json b/client/src/locale/target/player_eo.json
index 19d63e83d..7eb6f0982 100644
--- a/client/src/locale/target/player_eo.json
+++ b/client/src/locale/target/player_eo.json
@@ -1 +1 @@
-{"Audio Player":"Sonludilo","Video Player":"Filmludilo","Play":"Ludi","Pause":"Paŭzigi","Replay":"Reludi","Current Time":"Nuna tempo","Duration":"Daŭro","Remaining Time":"Restanta tempo","Stream Type":"Speco de elsendo","LIVE":"VIVE","Loaded":"Enlegita","Progress":"Plenumo","Progress Bar":"Plenuma strio","progress bar timing: currentTime={1} duration={2}":"{1} el {2}","Fullscreen":"Tutekrana reĝimo","Non-Fullscreen":"Partekrana reĝimo","Mute":"Silentigi","Unmute":"Malsilentigi","Playback Rate":"Ludrapido","Subtitles":"Subteksto","subtitles off":"subtekstoj for","Captions":"Transskribo","captions off":"transskribo for","Chapters":"Ĉapitroj","Descriptions":"Priskriboj","descriptions off":"priskriboj for","Volume Level":"Laŭteco","You aborted the media playback":"Vi ĉesigis la ludadon","A network error caused the media download to fail part-way.":"Reta eraro interrompis elŝuton de la aŭdvidaĵo.","The media could not be loaded, either because the server or network failed or because the format is not supported.":"Ne povis enlegi aŭdvidaĵon, aŭ ĉar servilo aŭ reto fiaskis, aŭ ĉar la formo ne estas subtenata.","The media playback was aborted due to a corruption problem or because the media used features your browser did not support.":"Ludado de la aŭdvidaĵo ĉesis aŭ pro difekto, aŭ ĉar ĝi postulis funkciojn, kiujn via foliumilo ne havis.","No compatible source was found for this media.":"Neniu kongrua fonto troviĝis por tiu ĉi aŭdvidaĵo.","The media is encrypted and we do not have the keys to decrypt it.":"Ĉi tiu aŭdvidaĵo estas ĉifrita, kaj ni ne havas la ŝlosilojn por malĉifri ĝin.","Play Video":"Ludi filmon","Close":"Fermi","Close Modal Dialog":"Fermi fokusigan interagujon","Modal Window":"Fokusiga fenestro","This is a modal window":"Tio ĉi estas fokusiga fenestro","This modal can be closed by pressing the Escape key or activating the close button.":"Tiu ĉi fokusiga fenestro povas esti fermita per la nuliga klavo, aŭ premo de la ferma butono.",", opens captions settings dialog":", malfermas interagujon kun agordoj pri transskriboj",", opens subtitles settings dialog":", malfermas interagujon kun agordoj pri subtekstoj",", opens descriptions settings dialog":", malfermas interagujon kun agordoj pri priskriboj",", selected":", elektita","captions settings":"agordoj pri transskriboj","subtitles settings":"agordoj pri subtekstoj","descriptions settings":"agordoj pri priskriboj","Text":"Teksto","White":"Blanka","Black":"Nigra","Red":"Ruĝa","Green":"Verda","Blue":"Blua","Yellow":"Flava","Magenta":"Fuksia","Cyan":"Lazura","Background":"Fono","Window":"Fenestro","Transparent":"Travidebla","Semi-Transparent":"Parte travidebla","Opaque":"Netravidebla","Font Size":"Grando de tiparo","Text Edge Style":"Stilo de randoj de teksto","None":"Neniu","Raised":"Levita","Depressed":"Mallevita","Uniform":"Unuforma","Dropshadow":"Ĵetita ombro","Font Family":"Tipara familio","Proportional Sans-Serif":"Proporcia senserifa","Monospace Sans-Serif":"Egallarĝa senserifa","Proportional Serif":"Proporcia serifa","Monospace Serif":"Egallarĝa serifa","Casual":"Neformala","Script":"Manskribo","Small Caps":"Majuskletoj","Reset":"Restarigi","restore all settings to the default values":"restarigi komencajn agordojn","Done":"Farite","Caption Settings Dialog":"Interagujo kun agordoj pri transskriboj","Beginning of dialog window. Escape will cancel and close the window.":"Komenco de interaga fenestro. Nuliga klavo nuligos kaj fermos la fenestron.","End of dialog window.":"Fino de interaga fenestro.","{1} is loading.":"{1} estas enlegata.","Quality":"Kvalito","Auto":"Memdecide","Speed":"Rapido","peers":"samtavolanoj","Go to the video page":"Iri al paĝo de la filmo","Settings":"Agordoj","Uses P2P, others may know you are watching this video.":"Uzas samtavolan teĥnikaron; aliuloj eble scios, ke vi spektas la filmon.","Copy the video URL":"Kopii ligilon al la filmo","Copy the video URL at the current time":"Kopii ligilon al nuna tempo en la filmo","Copy embed code":"Kopii enkorpigitan kodon"}
-\ No newline at end of file
+{"Audio Player":"Sonludilo","Video Player":"Filmludilo","Play":"Ludi","Pause":"Paŭzigi","Replay":"Reludi","Current Time":"Nuna tempo","Duration":"Daŭro","Remaining Time":"Restanta tempo","Stream Type":"Speco de elsendo","LIVE":"VIVE","Loaded":"Enlegita","Progress":"Plenumo","Progress Bar":"Plenuma strio","progress bar timing: currentTime={1} duration={2}":"{1} el {2}","Fullscreen":"Tutekrana reĝimo","Non-Fullscreen":"Partekrana reĝimo","Mute":"Silentigi","Unmute":"Malsilentigi","Playback Rate":"Ludrapido","Subtitles":"Subteksto","subtitles off":"subtekstoj for","Captions":"Transskribo","captions off":"transskribo for","Chapters":"Ĉapitroj","Descriptions":"Priskriboj","descriptions off":"priskriboj for","Audio Track":"Sona trako","Volume Level":"Laŭteco","You aborted the media playback":"Vi ĉesigis la ludadon","A network error caused the media download to fail part-way.":"Reta eraro interrompis elŝuton de la aŭdvidaĵo.","The media could not be loaded, either because the server or network failed or because the format is not supported.":"Ne povis enlegi aŭdvidaĵon, aŭ ĉar servilo aŭ reto fiaskis, aŭ ĉar la formo ne estas subtenata.","The media playback was aborted due to a corruption problem or because the media used features your browser did not support.":"Ludado de la aŭdvidaĵo ĉesis aŭ pro difekto, aŭ ĉar ĝi postulis funkciojn, kiujn via foliumilo ne havis.","No compatible source was found for this media.":"Neniu kongrua fonto troviĝis por tiu ĉi aŭdvidaĵo.","The media is encrypted and we do not have the keys to decrypt it.":"Ĉi tiu aŭdvidaĵo estas ĉifrita, kaj ni ne havas la ŝlosilojn por malĉifri ĝin.","Play Video":"Ludi filmon","Close":"Fermi","Close Modal Dialog":"Fermi fokusigan interagujon","Modal Window":"Fokusiga fenestro","This is a modal window":"Tio ĉi estas fokusiga fenestro","This modal can be closed by pressing the Escape key or activating the close button.":"Tiu ĉi fokusiga fenestro povas esti fermita per la nuliga klavo, aŭ premo de la ferma butono.",", opens captions settings dialog":", malfermas interagujon kun agordoj pri transskriboj",", opens subtitles settings dialog":", malfermas interagujon kun agordoj pri subtekstoj",", opens descriptions settings dialog":", malfermas interagujon kun agordoj pri priskriboj",", selected":", elektita","captions settings":"agordoj pri transskriboj","subtitles settings":"agordoj pri subtekstoj","descriptions settings":"agordoj pri priskriboj","Text":"Teksto","White":"Blanka","Black":"Nigra","Red":"Ruĝa","Green":"Verda","Blue":"Blua","Yellow":"Flava","Magenta":"Fuksia","Cyan":"Lazura","Background":"Fono","Window":"Fenestro","Transparent":"Travidebla","Semi-Transparent":"Parte travidebla","Opaque":"Netravidebla","Font Size":"Grando de tiparo","Text Edge Style":"Stilo de randoj de teksto","None":"Neniu","Raised":"Levita","Depressed":"Mallevita","Uniform":"Unuforma","Dropshadow":"Ĵetita ombro","Font Family":"Tipara familio","Proportional Sans-Serif":"Proporcia senserifa","Monospace Sans-Serif":"Egallarĝa senserifa","Proportional Serif":"Proporcia serifa","Monospace Serif":"Egallarĝa serifa","Casual":"Neformala","Script":"Manskribo","Small Caps":"Majuskletoj","Reset":"Restarigi","restore all settings to the default values":"restarigi komencajn agordojn","Done":"Farite","Caption Settings Dialog":"Interagujo kun agordoj pri transskriboj","Beginning of dialog window. Escape will cancel and close the window.":"Komenco de interaga fenestro. Nuliga klavo nuligos kaj fermos la fenestron.","End of dialog window.":"Fino de interaga fenestro.","{1} is loading.":"{1} estas enlegata.","Quality":"Kvalito","Auto":"Memdecide","Speed":"Rapido","peers":"samtavolanoj","Go to the video page":"Iri al paĝo de la filmo","Settings":"Agordoj","Uses P2P, others may know you are watching this video.":"Uzas samtavolan teĥnikaron; aliuloj eble scios, ke vi spektas la filmon.","Copy the video URL":"Kopii ligilon al la filmo","Copy the video URL at the current time":"Kopii ligilon al nuna tempo en la filmo","Copy embed code":"Kopii enkorpigitan kodon"}
+\ No newline at end of file
diff --git a/client/src/locale/target/player_uk_UA.xml b/client/src/locale/target/player_uk_UA.xml
new file mode 100644
index 000000000..ca58ea87c
--- /dev/null
+++ b/client/src/locale/target/player_uk_UA.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--XLIFF document generated by Zanata. Visit http://zanata.org for more infomation.-->
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.1" xmlns:xyz="urn:appInfo:Items" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.1 http://www.oasis-open.org/committees/xliff/documents/xliff-core-1.1.xsd" version="1.1">
+  <file source-language="en-US" datatype="plaintext" original="" target-language="uk-UA">
+    <body>
+      <trans-unit id="Audio Player">
+        <source>Audio Player</source>
+        <target>Аудіо Плеер</target>
+      </trans-unit>
+      <trans-unit id="Video Player">
+        <source>Video Player</source>
+        <target>Відео Плеер</target>
+      </trans-unit>
+      <trans-unit id="Pause">
+        <source>Pause</source>
+        <target>Пауза</target>
+      </trans-unit>
+      <trans-unit id="Replay">
+        <source>Replay</source>
+        <target>Повтор</target>
+      </trans-unit>
+      <trans-unit id="Current Time">
+        <source>Current Time</source>
+        <target>Поточний час</target>
+      </trans-unit>
+      <trans-unit id="Duration">
+        <source>Duration</source>
+        <target>Тривалисть</target>
+      </trans-unit>
+      <trans-unit id="Stream Type">
+        <source>Stream Type</source>
+        <target>Тип Потоку</target>
+      </trans-unit>
+      <trans-unit id="LIVE">
+        <source>LIVE</source>
+        <target>НАЖИВО</target>
+      </trans-unit>
+      <trans-unit id="Loaded">
+        <source>Loaded</source>
+        <target>Завантажено</target>
+      </trans-unit>
+      <trans-unit id="Progress">
+        <source>Progress</source>
+        <target>Прогрес</target>
+      </trans-unit>
+      <trans-unit id="Progress Bar">
+        <source>Progress Bar</source>
+        <target>Прогрес бар</target>
+      </trans-unit>
+      <trans-unit id="progress bar timing: currentTime={1} duration={2}">
+        <source>{1} of {2}</source>
+        <target>{1} of {2}</target>
+      </trans-unit>
+      <trans-unit id="Fullscreen">
+        <source>Fullscreen</source>
+        <target>Повноекраний режим</target>
+      </trans-unit>
+      <trans-unit id="Non-Fullscreen">
+        <source>Non-Fullscreen</source>
+        <target>Вийти з повноекранного режиму</target>
+      </trans-unit>
+      <trans-unit id="Subtitles">
+        <source>Subtitles</source>
+        <target>Субтитри</target>
+      </trans-unit>
+      <trans-unit id="subtitles off">
+        <source>subtitles off</source>
+        <target>subtitles off</target>
+      </trans-unit>
+      <trans-unit id="Captions">
+        <source>Captions</source>
+        <target>Титри</target>
+      </trans-unit>
+      <trans-unit id="captions off">
+        <source>captions off</source>
+        <target>captions off</target>
+      </trans-unit>
+      <trans-unit id="Chapters">
+        <source>Chapters</source>
+        <target>Глави</target>
+      </trans-unit>
+      <trans-unit id="Descriptions">
+        <source>Descriptions</source>
+        <target>Опис</target>
+      </trans-unit>
+      <trans-unit id="descriptions off">
+        <source>descriptions off</source>
+        <target>descriptions off</target>
+      </trans-unit>
+      <trans-unit id="Close">
+        <source>Close</source>
+        <target>Закрити</target>
+      </trans-unit>
+      <trans-unit id="Close Modal Dialog">
+        <source>Close Modal Dialog</source>
+        <target>Закрити_Модальне_Вікно</target>
+      </trans-unit>
+      <trans-unit id="Modal Window">
+        <source>Modal Window</source>
+        <target>Модальне_Вікно</target>
+      </trans-unit>
+      <trans-unit id="Text">
+        <source>Text</source>
+        <target>Текст</target>
+      </trans-unit>
+      <trans-unit id="White">
+        <source>White</source>
+        <target>Біле</target>
+      </trans-unit>
+      <trans-unit id="Black">
+        <source>Black</source>
+        <target>Чорне</target>
+      </trans-unit>
+      <trans-unit id="Red">
+        <source>Red</source>
+        <target>Червоний</target>
+      </trans-unit>
+      <trans-unit id="Green">
+        <source>Green</source>
+        <target>Зелений</target>
+      </trans-unit>
+      <trans-unit id="Blue">
+        <source>Blue</source>
+        <target>Голубий</target>
+      </trans-unit>
+      <trans-unit id="Yellow">
+        <source>Yellow</source>
+        <target>Жовтий</target>
+      </trans-unit>
+      <trans-unit id="Magenta">
+        <source>Magenta</source>
+        <target>Пурпурний</target>
+      </trans-unit>
+      <trans-unit id="Background">
+        <source>Background</source>
+        <target>Фон</target>
+      </trans-unit>
+      <trans-unit id="Window">
+        <source>Window</source>
+        <target>Вікно</target>
+      </trans-unit>
+      <trans-unit id="Transparent">
+        <source>Transparent</source>
+        <target>Прозорість</target>
+      </trans-unit>
+      <trans-unit id="Semi-Transparent">
+        <source>Semi-Transparent</source>
+        <target>Пів-прозорий</target>
+      </trans-unit>
+      <trans-unit id="Reset">
+        <source>Reset</source>
+        <target>Скинути</target>
+      </trans-unit>
+      <trans-unit id="Done">
+        <source>Done</source>
+        <target>Готово</target>
+      </trans-unit>
+      <trans-unit id="Quality">
+        <source>Quality</source>
+        <target>Якість</target>
+      </trans-unit>
+      <trans-unit id="Auto">
+        <source>Auto</source>
+        <target>Автоматично</target>
+      </trans-unit>
+      <trans-unit id="Speed">
+        <source>Speed</source>
+        <target>Швидкість</target>
+      </trans-unit>
+      <trans-unit id="Settings">
+        <source>Settings</source>
+        <target>Налаштунки</target>
+      </trans-unit>
+    </body>
+  </file></xliff>
+\ No newline at end of file
diff --git a/client/src/locale/target/server_de_DE.xml b/client/src/locale/target/server_de_DE.xml
index ef19ae2f0..049a3c505 100644
--- a/client/src/locale/target/server_de_DE.xml
+++ b/client/src/locale/target/server_de_DE.xml
@@ -29,7 +29,7 @@
      </trans-unit>
      <trans-unit id="Gaming">
        <source>Gaming</source>
-        <target>Spielen</target>
+        <target>Spiele</target>
      </trans-unit>
      <trans-unit id="People">
        <source>People</source>
@@ -39,10 +39,18 @@
        <source>Comedy</source>
        <target>Komödie</target>
      </trans-unit>
+      <trans-unit id="Entertainment">
+        <source>Entertainment</source>
+        <target>Unterhaltung</target>
+      </trans-unit>
      <trans-unit id="News">
        <source>News</source>
        <target>Nachrichten</target>
      </trans-unit>
+      <trans-unit id="How To">
+        <source>How To</source>
+        <target>How-to</target>
+      </trans-unit>
      <trans-unit id="Education">
        <source>Education</source>
        <target>Bildung</target>
@@ -53,7 +61,7 @@
      </trans-unit>
      <trans-unit id="Science &amp; Technology">
        <source>Science &amp; Technology</source>
-        <target>Wißenschaft und Technologie</target>
+        <target>Wissenschaft und Technologie</target>
      </trans-unit>
      <trans-unit id="Animals">
        <source>Animals</source>
@@ -91,5 +99,29 @@
        <source>Attribution - Non Commercial - No Derivatives</source>
        <target>Namensnennung - nicht kommerziell, keine Bearbeitung</target>
      </trans-unit>
+      <trans-unit id="Public Domain Dedication">
+        <source>Public Domain Dedication</source>
+        <target>In Gemeinfreiheit entlassen</target>
+      </trans-unit>
+      <trans-unit id="Public">
+        <source>Public</source>
+        <target>Öffentlich</target>
+      </trans-unit>
+      <trans-unit id="Unlisted">
+        <source>Unlisted</source>
+        <target>Ungelistet</target>
+      </trans-unit>
+      <trans-unit id="Private">
+        <source>Private</source>
+        <target>Privat</target>
+      </trans-unit>
+      <trans-unit id="Misc">
+        <source>Misc</source>
+        <target>Verschiedenes</target>
+      </trans-unit>
+      <trans-unit id="Unknown">
+        <source>Unknown</source>
+        <target>Unbekannt</target>
+      </trans-unit>
    </body>
  </file></xliff>
 \ No newline at end of file
diff --git a/client/src/locale/target/server_eo.json b/client/src/locale/target/server_eo.json
index 664984773..8d05bdfa3 100644
--- a/client/src/locale/target/server_eo.json
+++ b/client/src/locale/target/server_eo.json
@@ -1 +1 @@
-{"Music":"Muziko","Films":"Filmoj","Vehicles":"Veturiloj","Art":"Arto","Sports":"Sporto","Travels":"Vojaĝado","Gaming":"Ludoj","People":"Homoj","Comedy":"Komedio","Entertainment":"Amuzo","News":"Novaĵoj","How To":"Instrukcioj","Education":"Instruado","Activism":"Aktivismo","Science & Technology":"Scienco ϗ teĥnikaro","Animals":"Bestoj","Kids":"Infanoj","Food":"Manĝo","Attribution":"Atribuite","Attribution - Share Alike":"Atribuite – Samkondiĉe","Attribution - No Derivatives":"Atribuite – Nemodifite","Attribution - Non Commercial":"Atribuite – Nekomerce","Attribution - Non Commercial - Share Alike":"Atribuite – Nekomerce – Samkondiĉe","Attribution - Non Commercial - No Derivatives":"Atribuite – Nekomerce – Nemodifite","Public Domain Dedication":"Dediĉo al publika posedo","Public":"Publika","Unlisted":"Nelistigata","Private":"Privata","Misc":"Diversaĵoj","Unknown":"Nekonata","Afar":"Afara","Abkhazian":"Abĥaza","Afrikaans":"Afrikansa","Akan":"Akana","Amharic":"Amhara","Arabic":"Araba","Aragonese":"Aragona","American Sign Language":"Usona gestlingvo","Assamese":"Asama","Avaric":"Avara","Aymara":"Ajmara","Azerbaijani":"Azerbajĝana","Bashkir":"Baŝkira","Bambara":"Bambara","Belarusian":"Belorusa","Bengali":"Bengala","British Sign Language":"Brita gestlingvo","Bislama":"Bislama","Tibetan":"Tibeta","Bosnian":"Bosna","Breton":"Bretona","Bulgarian":"Bulgara","Brazilian Sign Language":"Brazila gestlingvo","Catalan":"Kataluna","Czech":"Ĉeĥa","Chamorro":"Ĉamora","Chechen":"Ĉeĉena","Chuvash":"Ĉuvaŝa","Cornish":"Kornvala","Corsican":"Korsika","Czech Sign Language":"Ĉeĥa gestlingvo","Chinese Sign Language":"Ĉina gestlingvo","Welsh":"Kimra","Danish":"Dana","German":"Germana","Dhivehi":"Maldiva","Danish Sign Language":"Dana gestlingvo","Dzongkha":"Butana","Modern Greek (1453-)":"Novgreka","English":"Angla","Estonian":"Estona","Basque":"Eŭska","Ewe":"Evea","Faroese":"Feroa","Persian":"Persa","Fijian":"Fiĝia","French":"Franca","Western Frisian":"Okcidentfrisa","French Sign Language":"Franca gestlingvo","Fulah":"Fula","Scottish Gaelic":"Skotgaela","Irish":"Irlanda","Galician":"Galega","Manx":"Manksa","Guarani":"Gvarania","German Sign Language":"Germana gestlingvo","Gujarati":"Guĝarata","Haitian":"Haitia","Hausa":"Haŭsa","Serbo-Croatian":"Kroatserba","Hebrew":"Hebrea","Herero":"Herera","Hindi":"Hinda","Hiri Motu":"Hirimotua","Croatian":"Kroata","Hungarian":"Hungara","Armenian":"Armena","Igbo":"Igba","Inuktitut":"Inuktituta","Indonesian":"Indonezia","Inupiaq":"Inupiko","Icelandic":"Islanda","Italian":"Itala","Javanese":"Java","Japanese":"Japana","Japanese Sign Language":"Japana gestlingvo","Kalaallisut":"Gronlanda","Kashmiri":"Kaŝmira","Georgian":"Kartvela","Kanuri":"Kanuria","Kazakh":"Kazaĥa","Khmer":"Kmera","Kirghiz":"Kirgiza","Komi":"Komia","Kongo":"Konga","Korean":"Korea","Kuanyama":"Kvanjama","Kurdish":"Kurda","Lao":"Laosa","Latvian":"Latva","Limburgan":"Limburga","Lingala":"Lingala","Lithuanian":"Litova","Luxembourgish":"Luksemburga","Marshallese":"Marŝalinsula","Malayalam":"Malajalama","Marathi":"Marata","Macedonian":"Makedona","Malagasy":"Malgaŝa","Maltese":"Malta","Mongolian":"Mongola","Maori":"Maoria","Malay (macrolanguage)":"Malaja","Burmese":"Birma","Nauru":"Naura","Navajo":"Navajo","South Ndebele":"Sudndebela","North Ndebele":"Nordndebela","Ndonga":"Ndonga","Nepali (macrolanguage)":"Nepala","Dutch":"Nederlanda","Norwegian Nynorsk":"Novnorvega","Norwegian Bokmål":"Bukmolo","Norwegian":"Norvega","Nyanja":"Ĉiĉeva","Occitan (post 1500)":"Okcitana","Ojibwa":"Oĝibua","Oriya (macrolanguage)":"Orisa","Oromo":"Oroma","Ossetian":"Oseta","Panjabi":"Panĝaba","Pakistan Sign Language":"Pakistana gestlingvo","Polish":"Pola","Portuguese":"Portugala","Pushto":"Paŝtua","Quechua":"Keĉua","Romansh":"Romanĉa","Romanian":"Rumana","Russian Sign Language":"Rusa gestlingvo","Russian":"Rusa","Saudi Arabian Sign Language":"Saudarabuja gestlingvo","South African Sign Language":"Sudafrika gestlingvo","Sinhala":"Sinhala","Slovak":"Slovaka","Slovenian":"Slovena","Northern Sami":"Nordlapona","Samoan":"Samoa","Shona":"Ŝona","Sindhi":"Sinda","Somali":"Somala","Southern Sotho":"Sudsota","Spanish":"Hispana","Albanian":"Albana","Sardinian":"Sarda","Serbian":"Serba","Swati":"Svazia","Sundanese":"Sunda","Swahili (macrolanguage)":"Svahila","Swedish":"Sveda","Swedish Sign Language":"Sveda gestlingvo","Tahitian":"Tahitia","Tamil":"Tamula","Tatar":"Tatara","Telugu":"Telugua","Tajik":"Taĝika","Tagalog":"Tagaloga","Thai":"Taja","Tonga (Tonga Islands)":"Tonga","Tswana":"Cvana","Tsonga":"Conga","Turkmen":"Turkmena","Turkish":"Turka","Uighur":"Ujgura","Ukrainian":"Ukrajna","Urdu":"Urdua","Uzbek":"Uzbeka","Venda":"Vendaa","Vietnamese":"Vjetnama","Walloon":"Valona","Wolof":"Volofa","Xhosa":"Kosa","Yiddish":"Jido","Yoruba":"Joruba","Zhuang":"Ĉuanga","Chinese":"Ĉina","Zulu":"Zulua"}
-\ No newline at end of file
+{"Music":"Muziko","Films":"Filmoj","Vehicles":"Veturiloj","Art":"Arto","Sports":"Sporto","Travels":"Vojaĝado","Gaming":"Ludoj","People":"Homoj","Comedy":"Komedio","Entertainment":"Amuzo","News":"Novaĵoj","How To":"Instrukcioj","Education":"Instruado","Activism":"Aktivismo","Science & Technology":"Scienco ϗ teĥnikaro","Animals":"Bestoj","Kids":"Infanoj","Food":"Manĝo","Attribution":"Atribuite","Attribution - Share Alike":"Atribuite – Samkondiĉe","Attribution - No Derivatives":"Atribuite – Nemodifite","Attribution - Non Commercial":"Atribuite – Nekomerce","Attribution - Non Commercial - Share Alike":"Atribuite – Nekomerce – Samkondiĉe","Attribution - Non Commercial - No Derivatives":"Atribuite – Nekomerce – Nemodifite","Public Domain Dedication":"Dediĉo al publika posedo","Public":"Publika","Unlisted":"Nelistigata","Private":"Privata","Misc":"Diversaĵoj","Unknown":"Nekonata","Afar":"Afara","Abkhazian":"Abĥaza","Afrikaans":"Afrikansa","Akan":"Akana","Amharic":"Amhara","Arabic":"Araba","Aragonese":"Aragona","American Sign Language":"Usona gestlingvo","Assamese":"Asama","Avaric":"Avara","Aymara":"Ajmara","Azerbaijani":"Azerbajĝana","Bashkir":"Baŝkira","Bambara":"Bambara","Belarusian":"Belorusa","Bengali":"Bengala","British Sign Language":"Brita gestlingvo","Bislama":"Bislama","Tibetan":"Tibeta","Bosnian":"Bosna","Breton":"Bretona","Bulgarian":"Bulgara","Brazilian Sign Language":"Brazila gestlingvo","Catalan":"Kataluna","Czech":"Ĉeĥa","Chamorro":"Ĉamora","Chechen":"Ĉeĉena","Chuvash":"Ĉuvaŝa","Cornish":"Kornvala","Corsican":"Korsika","Czech Sign Language":"Ĉeĥa gestlingvo","Chinese Sign Language":"Ĉina gestlingvo","Welsh":"Kimra","Danish":"Dana","German":"Germana","Dhivehi":"Maldiva","Danish Sign Language":"Dana gestlingvo","Dzongkha":"Butana","Modern Greek (1453-)":"Novgreka","English":"Angla","Estonian":"Estona","Basque":"Eŭska","Ewe":"Evea","Faroese":"Feroa","Persian":"Persa","Fijian":"Fiĝia","Finnish":"Finna","French":"Franca","Western Frisian":"Okcidentfrisa","French Sign Language":"Franca gestlingvo","Fulah":"Fula","Scottish Gaelic":"Skotgaela","Irish":"Irlanda","Galician":"Galega","Manx":"Manksa","Guarani":"Gvarania","German Sign Language":"Germana gestlingvo","Gujarati":"Guĝarata","Haitian":"Haitia","Hausa":"Haŭsa","Serbo-Croatian":"Kroatserba","Hebrew":"Hebrea","Herero":"Herera","Hindi":"Hinda","Hiri Motu":"Hirimotua","Croatian":"Kroata","Hungarian":"Hungara","Armenian":"Armena","Igbo":"Igba","Sichuan Yi":"Jia","Inuktitut":"Inuktituta","Indonesian":"Indonezia","Inupiaq":"Inupiko","Icelandic":"Islanda","Italian":"Itala","Javanese":"Java","Japanese":"Japana","Japanese Sign Language":"Japana gestlingvo","Kalaallisut":"Gronlanda","Kannada":"Kanara","Kashmiri":"Kaŝmira","Georgian":"Kartvela","Kanuri":"Kanuria","Kazakh":"Kazaĥa","Khmer":"Kmera","Kirghiz":"Kirgiza","Komi":"Komia","Kongo":"Konga","Korean":"Korea","Kuanyama":"Kvanjama","Kurdish":"Kurda","Lao":"Laosa","Latvian":"Latva","Limburgan":"Limburga","Lingala":"Lingala","Lithuanian":"Litova","Luxembourgish":"Luksemburga","Marshallese":"Marŝalinsula","Malayalam":"Malajalama","Marathi":"Marata","Macedonian":"Makedona","Malagasy":"Malgaŝa","Maltese":"Malta","Mongolian":"Mongola","Maori":"Maoria","Malay (macrolanguage)":"Malaja","Burmese":"Birma","Nauru":"Naura","Navajo":"Navajo","South Ndebele":"Sudndebela","North Ndebele":"Nordndebela","Ndonga":"Ndonga","Nepali (macrolanguage)":"Nepala","Dutch":"Nederlanda","Norwegian Nynorsk":"Novnorvega","Norwegian Bokmål":"Bukmolo","Norwegian":"Norvega","Nyanja":"Ĉiĉeva","Occitan (post 1500)":"Okcitana","Ojibwa":"Oĝibua","Oriya (macrolanguage)":"Orisa","Oromo":"Oroma","Ossetian":"Oseta","Panjabi":"Panĝaba","Pakistan Sign Language":"Pakistana gestlingvo","Polish":"Pola","Portuguese":"Portugala","Pushto":"Paŝtua","Quechua":"Keĉua","Romansh":"Romanĉa","Romanian":"Rumana","Russian Sign Language":"Rusa gestlingvo","Russian":"Rusa","Saudi Arabian Sign Language":"Saudarabuja gestlingvo","South African Sign Language":"Sudafrika gestlingvo","Sinhala":"Sinhala","Slovak":"Slovaka","Slovenian":"Slovena","Northern Sami":"Nordlapona","Samoan":"Samoa","Shona":"Ŝona","Sindhi":"Sinda","Somali":"Somala","Southern Sotho":"Sudsota","Spanish":"Hispana","Albanian":"Albana","Sardinian":"Sarda","Serbian":"Serba","Swati":"Svazia","Sundanese":"Sunda","Swahili (macrolanguage)":"Svahila","Swedish":"Sveda","Swedish Sign Language":"Sveda gestlingvo","Tahitian":"Tahitia","Tamil":"Tamula","Tatar":"Tatara","Telugu":"Telugua","Tajik":"Taĝika","Tagalog":"Tagaloga","Thai":"Taja","Tonga (Tonga Islands)":"Tonga","Tswana":"Cvana","Tsonga":"Conga","Turkmen":"Turkmena","Turkish":"Turka","Uighur":"Ujgura","Ukrainian":"Ukrajna","Urdu":"Urdua","Uzbek":"Uzbeka","Venda":"Vendaa","Vietnamese":"Vjetnama","Walloon":"Valona","Wolof":"Volofa","Xhosa":"Kosa","Yiddish":"Jido","Yoruba":"Joruba","Zhuang":"Ĉuanga","Chinese":"Ĉina","Zulu":"Zulua"}
+\ No newline at end of file
diff --git a/client/src/locale/target/server_es_ES.xml b/client/src/locale/target/server_es_ES.xml
index a57071214..8dea57abc 100644
--- a/client/src/locale/target/server_es_ES.xml
+++ b/client/src/locale/target/server_es_ES.xml
@@ -99,6 +99,26 @@
        <source>Attribution - Non Commercial - No Derivatives</source>
        <target>Atribución - No Comercial - No Derivadas</target>
      </trans-unit>
+      <trans-unit id="Public Domain Dedication">
+        <source>Public Domain Dedication</source>
+        <target>Dominio Público</target>
+      </trans-unit>
+      <trans-unit id="Public">
+        <source>Public</source>
+        <target>Público</target>
+      </trans-unit>
+      <trans-unit id="Unlisted">
+        <source>Unlisted</source>
+        <target>Sin listar</target>
+      </trans-unit>
+      <trans-unit id="Private">
+        <source>Private</source>
+        <target>Privado</target>
+      </trans-unit>
+      <trans-unit id="Misc">
+        <source>Misc</source>
+        <target>Miscelánea</target>
+      </trans-unit>
      <trans-unit id="Unknown">
        <source>Unknown</source>
        <target>Desconocido</target>