Move iso639 strings in its own translation file

9 files changed, 1044 insertions, 927 deletions

diff --git a/client/src/locale/source/angular_en_US.xml b/client/src/locale/source/angular_en_US.xml
index 859212ae7..456879a68 100644
--- a/client/src/locale/source/angular_en_US.xml
+++ b/client/src/locale/source/angular_en_US.xml
@@ -379,9 +379,9 @@
           <context context-type="sourcefile">app/menu/menu.component.ts</context>
           <context context-type="linenumber">17</context>
         </context-group>
-      </trans-unit><trans-unit id="eee05612e26cfe9527f08c6e74df7dfd84880ae9" datatype="html">
+      </trans-unit><trans-unit id="f1ae2fbc12a3515501b3d96ac6f2675c0df1cf11" datatype="html">
         <source>
-            My settings
+            My account
           </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/menu/menu.component.ts</context>
@@ -733,53 +733,59 @@ Check this checkbox, save the configuration and test with a video URL of your in
           <context context-type="sourcefile">app/+admin/config/edit-custom-config/edit-custom-config.component.ts</context>
           <context context-type="linenumber">178</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-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">184</context>
+          <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit><trans-unit id="6aff7f4b4f140702c4ce791cc9990932623862f0" datatype="html">
         <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">203</context>
+          <context context-type="linenumber">205</context>
         </context-group>
       </trans-unit><trans-unit id="1fa92c6ce274f878b2625587daa7e08b2a3a8b38" datatype="html">
         <source>Cache</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">207</context>
+          <context context-type="linenumber">209</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">210</context>
+          <context context-type="linenumber">212</context>
         </context-group>
       </trans-unit><trans-unit id="bf91318659ada3d3ad1b0ca1e63ae427e5a857d5" datatype="html">
         <source>Previews are not federated. 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">213</context>
+          <context context-type="linenumber">215</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">225</context>
+          <context context-type="linenumber">227</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">228</context>
+          <context context-type="linenumber">230</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">231</context>
+          <context context-type="linenumber">233</context>
         </context-group>
       </trans-unit><trans-unit id="f133b08d6519081bfb8ef51cff4bf2b3af23dde6" datatype="html">
         <source>
@@ -799,7 +805,7 @@ 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">247</context>
+          <context context-type="linenumber">249</context>
         </context-group>
       </trans-unit><trans-unit id="6c44844ebdb7352c433b7734feaa65f01bb594ab" datatype="html">
         <source>Advanced configuration</source>
@@ -811,7 +817,13 @@ Check this checkbox, save the configuration and test with a video URL of your in
         <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">274</context>
+          <context context-type="linenumber">276</context>
+        </context-group>
+      </trans-unit><trans-unit id="79fa449efc618f94816c6558433870dd71865c13" datatype="html">
+        <source>It seems the configration 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-group>
       </trans-unit><trans-unit id="80dbb8ba42b97a9ec035c0ba09f45c07ea07096c" datatype="html">
         <source>
@@ -1458,6 +1470,18 @@ 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">109</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">115</context>
+        </context-group>
+      </trans-unit><trans-unit id="0001ec53fe3dfd603b7ad80fd32d262170e3d9a5" datatype="html">
+        <source>If you decide to not wait transcoding before publishing the video, it can be unplayable until it 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">118</context>
+        </context-group>
       </trans-unit><trans-unit id="c7742322b1d3dbc921362058d1747c7ec2adbec7" datatype="html">
         <source>Basic info</source>
         <context-group purpose="location">
@@ -1468,19 +1492,19 @@ When you will upload a video in this channel, the video support field will be au
         <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">119</context>
+          <context context-type="linenumber">129</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">126</context>
+          <context context-type="linenumber">136</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">132</context>
+          <context context-type="linenumber">142</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/modal/video-support.component.ts</context>
@@ -1488,19 +1512,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">53</context>
+          <context context-type="linenumber">55</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">133</context>
+          <context context-type="linenumber">143</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">115</context>
+          <context context-type="linenumber">125</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>
@@ -1524,7 +1548,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">87</context>
+          <context context-type="linenumber">89</context>
         </context-group>
       </trans-unit><trans-unit id="9aafb2a928664aa7a9375fd37c533f0375f8b611" datatype="html">
         <source>Download video</source>
@@ -1552,7 +1576,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">69</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit><trans-unit id="11749f4fc0aa1b5e37f38575e4d4e3b1b7e0e96b" datatype="html">
         <source>Report video</source>
@@ -1588,7 +1612,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">58</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit><trans-unit id="801b98c6f02fe3b32f6afa3ee854c99ed83474e6" datatype="html">
         <source>URL</source>
@@ -1610,8 +1634,10 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/videos/+video-watch/modal/video-share.component.ts</context>
           <context context-type="linenumber">35</context>
         </context-group>
-      </trans-unit><trans-unit id="5f60990802486b7906b422d80aace6a1b19dcc02" datatype="html">
-        <source>Video not found :&apos;(</source>
+      </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>
@@ -1622,85 +1648,85 @@ 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">15</context>
+          <context context-type="linenumber">17</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">20</context>
+          <context context-type="linenumber">22</context>
         </context-group>
-      </trans-unit><trans-unit id="912f005563d20191efc188dccedd35a7c4e6b396" 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.displayName}}"/&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>
+      </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">24</context>
+          <context context-type="linenumber">26</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">29</context>
+          <context context-type="linenumber">31</context>
         </context-group>
-      </trans-unit><trans-unit id="e88300c71e0cb0f346d5a72eb37c920f2aadae8a" datatype="html">
-        <source>Go the account page</source>
+      </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">28</context>
+          <context context-type="linenumber">30</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">41</context>
+          <context context-type="linenumber">43</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">48</context>
+          <context context-type="linenumber">50</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">68</context>
+          <context context-type="linenumber">70</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">75</context>
+          <context context-type="linenumber">77</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">74</context>
+          <context context-type="linenumber">76</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">81</context>
+          <context context-type="linenumber">83</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">80</context>
+          <context context-type="linenumber">82</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">86</context>
+          <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit><trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7" datatype="html">
         <source>Delete</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/video-watch.component.ts</context>
-          <context context-type="linenumber">93</context>
+          <context context-type="linenumber">95</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/comment/video-comment.component.ts</context>
@@ -1710,19 +1736,19 @@ When you will upload a video in this channel, the video support field will be au
         <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">92</context>
+          <context context-type="linenumber">94</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">112</context>
+          <context context-type="linenumber">114</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">118</context>
+          <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit><trans-unit id="8057a9b7f9e908ff350edfd71417b96c174e5911" datatype="html">
         <source>
@@ -1730,7 +1756,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">125</context>
+          <context context-type="linenumber">127</context>
         </context-group>
       </trans-unit><trans-unit id="bd407eca607a8905a26a9e30c9d0cd70f4465db8" datatype="html">
         <source>
@@ -1738,7 +1764,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">134</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit><trans-unit id="af5072bd79ea3cd767ab74a6622d2eee791b3832" datatype="html">
         <source>
@@ -1746,7 +1772,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">143</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit><trans-unit id="a911eee019174741b0aec6fcf3fbd5752fab3e67" datatype="html">
         <source>
@@ -1754,7 +1780,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">152</context>
+          <context context-type="linenumber">154</context>
         </context-group>
       </trans-unit><trans-unit id="ecf7007c2842cc26a7b91d08d48c7a4f5f749fb3" datatype="html">
         <source>
@@ -1762,7 +1788,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">161</context>
+          <context context-type="linenumber">163</context>
         </context-group>
       </trans-unit><trans-unit id="7ce8b0d7cc34d4c1ef4a21e990b0a001337bedd1" datatype="html">
         <source>
@@ -1770,13 +1796,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">175</context>
+          <context context-type="linenumber">177</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">187</context>
+          <context context-type="linenumber">189</context>
         </context-group>
       </trans-unit><trans-unit id="4c2fca29fd9d7e85abe85a206958a4226f403be2" datatype="html">
         <source>
@@ -1784,19 +1810,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">189</context>
+          <context context-type="linenumber">191</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">192</context>
+          <context context-type="linenumber">194</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">192</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit><trans-unit id="20fc98888baf65b5ba9fe9622dc036fa8dec6a5f" datatype="html">
         <source>
@@ -1804,7 +1830,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">195</context>
+          <context context-type="linenumber">197</context>
         </context-group>
       </trans-unit><trans-unit id="b5f5df598f2d75640849b2a7744f91e5dbd390e7" datatype="html">
         <source>
@@ -1814,8 +1840,8 @@ When you will upload a video in this channel, the video support field will be au
           <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.ts</context>
           <context context-type="linenumber">3</context>
         </context-group>
-      </trans-unit><trans-unit id="4b1a394a3d619606f79b1051b1493e6b743a072d" datatype="html">
-        <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;@&lt;x id="INTERPOLATION" equiv-text="{{video.account.displayName}}"/&gt;@&lt;x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/&gt;&lt;/strong&gt; and find back the video. Direct commenting capabilities are being worked on in &lt;a href=&apos;https://github.com/Chocobozzz/PeerTube/issues/224&apos;&gt;#224&lt;/a&gt;.</source>
+      </trans-unit><trans-unit id="da8a38f72f92714cf8680560c99982dc651480d5" datatype="html">
+        <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;@&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 find back the video. Direct commenting capabilities are being worked on in &lt;a href=&apos;https://github.com/Chocobozzz/PeerTube/issues/224&apos;&gt;#224&lt;/a&gt;.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.ts</context>
           <context context-type="linenumber">8</context>
@@ -1824,13 +1850,13 @@ When you will upload a video in this channel, the video support field will be au
         <source>No comments.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.ts</context>
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit><trans-unit id="69c081796209e45e26af91152ec9bd0a65ec261e" datatype="html">
         <source>View all &lt;x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/&gt; replies</source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.ts</context>
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit><trans-unit id="b7fccd922d6473725247ed85a9fdf96fe6794828" datatype="html">
         <source>
@@ -1838,7 +1864,7 @@ When you will upload a video in this channel, the video support field will be au
   </source>
         <context-group purpose="location">
           <context context-type="sourcefile">app/videos/+video-watch/comment/video-comments.component.ts</context>
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">64</context>
         </context-group>
       </trans-unit><trans-unit id="db79255cb8757e9e945ba5f901a2b67e4189016e" datatype="html">
         <source>Add comment...</source>
@@ -1967,6 +1993,14 @@ 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/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">src/app/core/auth/auth.service.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
@@ -2141,6 +2175,14 @@ 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/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <context-group purpose="location">
           <context context-type="sourcefile">src/app/login/login.component.ts</context>
           <context context-type="linenumber">1</context>
         </context-group>
@@ -2412,6 +2454,66 @@ 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="00e16d1f1c5cc936ec0881cd02cbf66aa1b4cddd" datatype="html">
+        <source>Do you really want to delete &lt;x id="INTERPOLATION" equiv-text="{{deleteLength}}"/&gt; videos?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="dff7d4574cfaa785cbd4c0a5ffb5befec19a5d83" datatype="html">
+        <source>&lt;x id="INTERPOLATION" equiv-text="{{deleteLength}}"/&gt; videos deleted.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4ec5852c869b2fb4ae0e564b51278d7be8013fc7" datatype="html">
+        <source>Do you really want to delete &lt;x id="INTERPOLATION" equiv-text="{{videoName}}"/&gt;?</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="d39a0bfa616a9a8473b2e379eefe17d8ed1af118" datatype="html">
+        <source>Video &lt;x id="INTERPOLATION" equiv-text="{{videoName}}"/&gt; deleted.</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+        <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="dd9f3264feed4935008861c15d81c947124e4ac3" datatype="html">
+        <source>Published</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="4a7e91ebe1cf184db5f2bfecf9c16ff81c9e2c02" datatype="html">
+        <source>Waiting transcoding</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="21f1c9d5c67346c830aced4f670045fcf0aeb83a" datatype="html">
+        <source>To transcode</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="28eed5307c7f1bdc4442b5b7cacbf9d6583b89d0" datatype="html">
+        <source>Unknown state</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/+my-account/my-account-videos/my-account-videos.component.ts</context>
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="814d28bf9dcbd3122254e664b446ac8e0442bc08" datatype="html">
         <source>Error getting about from server</source>
         <context-group purpose="location">
@@ -3158,13 +3260,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="d39a0bfa616a9a8473b2e379eefe17d8ed1af118" datatype="html">
-        <source>Video &lt;x id="INTERPOLATION" equiv-text="{{videoName}}"/&gt; deleted.</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="d5a4811e15319ad9354e1b62e9ca0131192b489e" datatype="html">
         <source>&lt;x id="INTERPOLATION" equiv-text="{{likesNumber}}"/&gt; likes / &lt;x id="INTERPOLATION_1" equiv-text="{{dislikesNumber}}"/&gt; dislikes</source>
         <context-group purpose="location">
diff --git a/client/src/locale/source/iso639_en_US.xml b/client/src/locale/source/iso639_en_US.xml
new file mode 100644
index 000000000..4bed9617c
--- /dev/null
+++ b/client/src/locale/source/iso639_en_US.xml
@@ -0,0 +1,758 @@
+<xliff xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 http://docs.oasis-open.org/xliff/v1.2/os/xliff-core-1.2-strict.xsd" xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+  <file original="namespace1" datatype="plaintext" source-language="undefined" target-language="undefined">
+    <body>
+      <trans-unit id="Afar">
+        <source>Afar</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Abkhazian">
+        <source>Abkhazian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Afrikaans">
+        <source>Afrikaans</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Akan">
+        <source>Akan</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Amharic">
+        <source>Amharic</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Arabic">
+        <source>Arabic</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Aragonese">
+        <source>Aragonese</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="American Sign Language">
+        <source>American Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Assamese">
+        <source>Assamese</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Avaric">
+        <source>Avaric</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Aymara">
+        <source>Aymara</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Azerbaijani">
+        <source>Azerbaijani</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Bashkir">
+        <source>Bashkir</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Bambara">
+        <source>Bambara</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Belarusian">
+        <source>Belarusian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Bengali">
+        <source>Bengali</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="British Sign Language">
+        <source>British Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Bislama">
+        <source>Bislama</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Tibetan">
+        <source>Tibetan</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Bosnian">
+        <source>Bosnian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Breton">
+        <source>Breton</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Bulgarian">
+        <source>Bulgarian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Brazilian Sign Language">
+        <source>Brazilian Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Catalan">
+        <source>Catalan</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Czech">
+        <source>Czech</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Chamorro">
+        <source>Chamorro</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Chechen">
+        <source>Chechen</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Chuvash">
+        <source>Chuvash</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Cornish">
+        <source>Cornish</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Corsican">
+        <source>Corsican</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Cree">
+        <source>Cree</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Czech Sign Language">
+        <source>Czech Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Chinese Sign Language">
+        <source>Chinese Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Welsh">
+        <source>Welsh</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Danish">
+        <source>Danish</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="German">
+        <source>German</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Dhivehi">
+        <source>Dhivehi</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Danish Sign Language">
+        <source>Danish Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Dzongkha">
+        <source>Dzongkha</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Modern Greek (1453-)">
+        <source>Modern Greek (1453-)</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="English">
+        <source>English</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Estonian">
+        <source>Estonian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Basque">
+        <source>Basque</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Ewe">
+        <source>Ewe</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Faroese">
+        <source>Faroese</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Persian">
+        <source>Persian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Fijian">
+        <source>Fijian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Finnish">
+        <source>Finnish</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="French">
+        <source>French</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Western Frisian">
+        <source>Western Frisian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="French Sign Language">
+        <source>French Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Fulah">
+        <source>Fulah</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Scottish Gaelic">
+        <source>Scottish Gaelic</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Irish">
+        <source>Irish</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Galician">
+        <source>Galician</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Manx">
+        <source>Manx</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Guarani">
+        <source>Guarani</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="German Sign Language">
+        <source>German Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Gujarati">
+        <source>Gujarati</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Haitian">
+        <source>Haitian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Hausa">
+        <source>Hausa</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Serbo-Croatian">
+        <source>Serbo-Croatian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Hebrew">
+        <source>Hebrew</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Herero">
+        <source>Herero</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Hindi">
+        <source>Hindi</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Hiri Motu">
+        <source>Hiri Motu</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Croatian">
+        <source>Croatian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Hungarian">
+        <source>Hungarian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Armenian">
+        <source>Armenian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Igbo">
+        <source>Igbo</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Sichuan Yi">
+        <source>Sichuan Yi</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Inuktitut">
+        <source>Inuktitut</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Indonesian">
+        <source>Indonesian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Inupiaq">
+        <source>Inupiaq</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Icelandic">
+        <source>Icelandic</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Italian">
+        <source>Italian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Javanese">
+        <source>Javanese</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Japanese">
+        <source>Japanese</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Japanese Sign Language">
+        <source>Japanese Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Kalaallisut">
+        <source>Kalaallisut</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Kannada">
+        <source>Kannada</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Kashmiri">
+        <source>Kashmiri</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Georgian">
+        <source>Georgian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Kanuri">
+        <source>Kanuri</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Kazakh">
+        <source>Kazakh</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Khmer">
+        <source>Khmer</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Kikuyu">
+        <source>Kikuyu</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Kinyarwanda">
+        <source>Kinyarwanda</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Kirghiz">
+        <source>Kirghiz</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Komi">
+        <source>Komi</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Kongo">
+        <source>Kongo</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Korean">
+        <source>Korean</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Kuanyama">
+        <source>Kuanyama</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Kurdish">
+        <source>Kurdish</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Lao">
+        <source>Lao</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Latvian">
+        <source>Latvian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Limburgan">
+        <source>Limburgan</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Lingala">
+        <source>Lingala</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Lithuanian">
+        <source>Lithuanian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Luxembourgish">
+        <source>Luxembourgish</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Luba-Katanga">
+        <source>Luba-Katanga</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Ganda">
+        <source>Ganda</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Marshallese">
+        <source>Marshallese</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Malayalam">
+        <source>Malayalam</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Marathi">
+        <source>Marathi</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Macedonian">
+        <source>Macedonian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Malagasy">
+        <source>Malagasy</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Maltese">
+        <source>Maltese</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Mongolian">
+        <source>Mongolian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Maori">
+        <source>Maori</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Malay (macrolanguage)">
+        <source>Malay (macrolanguage)</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Burmese">
+        <source>Burmese</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Nauru">
+        <source>Nauru</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Navajo">
+        <source>Navajo</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="South Ndebele">
+        <source>South Ndebele</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="North Ndebele">
+        <source>North Ndebele</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Ndonga">
+        <source>Ndonga</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Nepali (macrolanguage)">
+        <source>Nepali (macrolanguage)</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Dutch">
+        <source>Dutch</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Norwegian Nynorsk">
+        <source>Norwegian Nynorsk</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Norwegian Bokmål">
+        <source>Norwegian Bokmål</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Norwegian">
+        <source>Norwegian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Nyanja">
+        <source>Nyanja</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Occitan (post 1500)">
+        <source>Occitan (post 1500)</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Ojibwa">
+        <source>Ojibwa</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Oriya (macrolanguage)">
+        <source>Oriya (macrolanguage)</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Oromo">
+        <source>Oromo</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Ossetian">
+        <source>Ossetian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Panjabi">
+        <source>Panjabi</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Pakistan Sign Language">
+        <source>Pakistan Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Polish">
+        <source>Polish</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Portuguese">
+        <source>Portuguese</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Pushto">
+        <source>Pushto</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Quechua">
+        <source>Quechua</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Romansh">
+        <source>Romansh</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Romanian">
+        <source>Romanian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Russian Sign Language">
+        <source>Russian Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Rundi">
+        <source>Rundi</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Russian">
+        <source>Russian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Sango">
+        <source>Sango</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Saudi Arabian Sign Language">
+        <source>Saudi Arabian Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="South African Sign Language">
+        <source>South African Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Sinhala">
+        <source>Sinhala</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Slovak">
+        <source>Slovak</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Slovenian">
+        <source>Slovenian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Northern Sami">
+        <source>Northern Sami</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Samoan">
+        <source>Samoan</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Shona">
+        <source>Shona</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Sindhi">
+        <source>Sindhi</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Somali">
+        <source>Somali</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Southern Sotho">
+        <source>Southern Sotho</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Spanish">
+        <source>Spanish</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Albanian">
+        <source>Albanian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Sardinian">
+        <source>Sardinian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Serbian">
+        <source>Serbian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Swati">
+        <source>Swati</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Sundanese">
+        <source>Sundanese</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Swahili (macrolanguage)">
+        <source>Swahili (macrolanguage)</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Swedish">
+        <source>Swedish</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Swedish Sign Language">
+        <source>Swedish Sign Language</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Tahitian">
+        <source>Tahitian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Tamil">
+        <source>Tamil</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Tatar">
+        <source>Tatar</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Telugu">
+        <source>Telugu</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Tajik">
+        <source>Tajik</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Tagalog">
+        <source>Tagalog</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Thai">
+        <source>Thai</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Tigrinya">
+        <source>Tigrinya</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Tonga (Tonga Islands)">
+        <source>Tonga (Tonga Islands)</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Tswana">
+        <source>Tswana</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Tsonga">
+        <source>Tsonga</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Turkmen">
+        <source>Turkmen</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Turkish">
+        <source>Turkish</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Twi">
+        <source>Twi</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Uighur">
+        <source>Uighur</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Ukrainian">
+        <source>Ukrainian</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Urdu">
+        <source>Urdu</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Uzbek">
+        <source>Uzbek</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Venda">
+        <source>Venda</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Vietnamese">
+        <source>Vietnamese</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Walloon">
+        <source>Walloon</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Wolof">
+        <source>Wolof</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Xhosa">
+        <source>Xhosa</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Yiddish">
+        <source>Yiddish</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Yoruba">
+        <source>Yoruba</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Zhuang">
+        <source>Zhuang</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Chinese">
+        <source>Chinese</source>
+        <target>undefined</target>
+      </trans-unit>
+      <trans-unit id="Zulu">
+        <source>Zulu</source>
+        <target>undefined</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
\ No newline at end of file
diff --git a/client/src/locale/source/server_en_US.xml b/client/src/locale/source/server_en_US.xml
index dab91f98d..e94a01469 100644
--- a/client/src/locale/source/server_en_US.xml
+++ b/client/src/locale/source/server_en_US.xml
@@ -113,758 +113,6 @@
         <source>Private</source>
         <target>undefined</target>
       </trans-unit>
-      <trans-unit id="Afar">
-        <source>Afar</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Abkhazian">
-        <source>Abkhazian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Afrikaans">
-        <source>Afrikaans</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Akan">
-        <source>Akan</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Amharic">
-        <source>Amharic</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Arabic">
-        <source>Arabic</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Aragonese">
-        <source>Aragonese</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="American Sign Language">
-        <source>American Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Assamese">
-        <source>Assamese</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Avaric">
-        <source>Avaric</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Aymara">
-        <source>Aymara</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Azerbaijani">
-        <source>Azerbaijani</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Bashkir">
-        <source>Bashkir</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Bambara">
-        <source>Bambara</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Belarusian">
-        <source>Belarusian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Bengali">
-        <source>Bengali</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="British Sign Language">
-        <source>British Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Bislama">
-        <source>Bislama</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Tibetan">
-        <source>Tibetan</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Bosnian">
-        <source>Bosnian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Breton">
-        <source>Breton</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Bulgarian">
-        <source>Bulgarian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Brazilian Sign Language">
-        <source>Brazilian Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Catalan">
-        <source>Catalan</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Czech">
-        <source>Czech</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Chamorro">
-        <source>Chamorro</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Chechen">
-        <source>Chechen</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Chuvash">
-        <source>Chuvash</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Cornish">
-        <source>Cornish</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Corsican">
-        <source>Corsican</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Cree">
-        <source>Cree</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Czech Sign Language">
-        <source>Czech Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Chinese Sign Language">
-        <source>Chinese Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Welsh">
-        <source>Welsh</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Danish">
-        <source>Danish</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="German">
-        <source>German</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Dhivehi">
-        <source>Dhivehi</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Danish Sign Language">
-        <source>Danish Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Dzongkha">
-        <source>Dzongkha</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Modern Greek (1453-)">
-        <source>Modern Greek (1453-)</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="English">
-        <source>English</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Estonian">
-        <source>Estonian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Basque">
-        <source>Basque</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Ewe">
-        <source>Ewe</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Faroese">
-        <source>Faroese</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Persian">
-        <source>Persian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Fijian">
-        <source>Fijian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Finnish">
-        <source>Finnish</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="French">
-        <source>French</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Western Frisian">
-        <source>Western Frisian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="French Sign Language">
-        <source>French Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Fulah">
-        <source>Fulah</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Scottish Gaelic">
-        <source>Scottish Gaelic</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Irish">
-        <source>Irish</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Galician">
-        <source>Galician</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Manx">
-        <source>Manx</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Guarani">
-        <source>Guarani</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="German Sign Language">
-        <source>German Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Gujarati">
-        <source>Gujarati</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Haitian">
-        <source>Haitian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Hausa">
-        <source>Hausa</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Serbo-Croatian">
-        <source>Serbo-Croatian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Hebrew">
-        <source>Hebrew</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Herero">
-        <source>Herero</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Hindi">
-        <source>Hindi</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Hiri Motu">
-        <source>Hiri Motu</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Croatian">
-        <source>Croatian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Hungarian">
-        <source>Hungarian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Armenian">
-        <source>Armenian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Igbo">
-        <source>Igbo</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Sichuan Yi">
-        <source>Sichuan Yi</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Inuktitut">
-        <source>Inuktitut</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Indonesian">
-        <source>Indonesian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Inupiaq">
-        <source>Inupiaq</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Icelandic">
-        <source>Icelandic</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Italian">
-        <source>Italian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Javanese">
-        <source>Javanese</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Japanese">
-        <source>Japanese</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Japanese Sign Language">
-        <source>Japanese Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Kalaallisut">
-        <source>Kalaallisut</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Kannada">
-        <source>Kannada</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Kashmiri">
-        <source>Kashmiri</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Georgian">
-        <source>Georgian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Kanuri">
-        <source>Kanuri</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Kazakh">
-        <source>Kazakh</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Khmer">
-        <source>Khmer</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Kikuyu">
-        <source>Kikuyu</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Kinyarwanda">
-        <source>Kinyarwanda</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Kirghiz">
-        <source>Kirghiz</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Komi">
-        <source>Komi</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Kongo">
-        <source>Kongo</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Korean">
-        <source>Korean</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Kuanyama">
-        <source>Kuanyama</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Kurdish">
-        <source>Kurdish</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Lao">
-        <source>Lao</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Latvian">
-        <source>Latvian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Limburgan">
-        <source>Limburgan</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Lingala">
-        <source>Lingala</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Lithuanian">
-        <source>Lithuanian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Luxembourgish">
-        <source>Luxembourgish</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Luba-Katanga">
-        <source>Luba-Katanga</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Ganda">
-        <source>Ganda</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Marshallese">
-        <source>Marshallese</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Malayalam">
-        <source>Malayalam</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Marathi">
-        <source>Marathi</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Macedonian">
-        <source>Macedonian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Malagasy">
-        <source>Malagasy</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Maltese">
-        <source>Maltese</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Mongolian">
-        <source>Mongolian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Maori">
-        <source>Maori</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Malay (macrolanguage)">
-        <source>Malay (macrolanguage)</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Burmese">
-        <source>Burmese</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Nauru">
-        <source>Nauru</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Navajo">
-        <source>Navajo</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="South Ndebele">
-        <source>South Ndebele</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="North Ndebele">
-        <source>North Ndebele</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Ndonga">
-        <source>Ndonga</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Nepali (macrolanguage)">
-        <source>Nepali (macrolanguage)</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Dutch">
-        <source>Dutch</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Norwegian Nynorsk">
-        <source>Norwegian Nynorsk</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Norwegian Bokmål">
-        <source>Norwegian Bokmål</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Norwegian">
-        <source>Norwegian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Nyanja">
-        <source>Nyanja</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Occitan (post 1500)">
-        <source>Occitan (post 1500)</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Ojibwa">
-        <source>Ojibwa</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Oriya (macrolanguage)">
-        <source>Oriya (macrolanguage)</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Oromo">
-        <source>Oromo</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Ossetian">
-        <source>Ossetian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Panjabi">
-        <source>Panjabi</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Pakistan Sign Language">
-        <source>Pakistan Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Polish">
-        <source>Polish</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Portuguese">
-        <source>Portuguese</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Pushto">
-        <source>Pushto</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Quechua">
-        <source>Quechua</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Romansh">
-        <source>Romansh</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Romanian">
-        <source>Romanian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Russian Sign Language">
-        <source>Russian Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Rundi">
-        <source>Rundi</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Russian">
-        <source>Russian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Sango">
-        <source>Sango</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Saudi Arabian Sign Language">
-        <source>Saudi Arabian Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="South African Sign Language">
-        <source>South African Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Sinhala">
-        <source>Sinhala</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Slovak">
-        <source>Slovak</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Slovenian">
-        <source>Slovenian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Northern Sami">
-        <source>Northern Sami</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Samoan">
-        <source>Samoan</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Shona">
-        <source>Shona</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Sindhi">
-        <source>Sindhi</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Somali">
-        <source>Somali</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Southern Sotho">
-        <source>Southern Sotho</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Spanish">
-        <source>Spanish</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Albanian">
-        <source>Albanian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Sardinian">
-        <source>Sardinian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Serbian">
-        <source>Serbian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Swati">
-        <source>Swati</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Sundanese">
-        <source>Sundanese</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Swahili (macrolanguage)">
-        <source>Swahili (macrolanguage)</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Swedish">
-        <source>Swedish</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Swedish Sign Language">
-        <source>Swedish Sign Language</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Tahitian">
-        <source>Tahitian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Tamil">
-        <source>Tamil</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Tatar">
-        <source>Tatar</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Telugu">
-        <source>Telugu</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Tajik">
-        <source>Tajik</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Tagalog">
-        <source>Tagalog</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Thai">
-        <source>Thai</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Tigrinya">
-        <source>Tigrinya</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Tonga (Tonga Islands)">
-        <source>Tonga (Tonga Islands)</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Tswana">
-        <source>Tswana</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Tsonga">
-        <source>Tsonga</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Turkmen">
-        <source>Turkmen</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Turkish">
-        <source>Turkish</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Twi">
-        <source>Twi</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Uighur">
-        <source>Uighur</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Ukrainian">
-        <source>Ukrainian</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Urdu">
-        <source>Urdu</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Uzbek">
-        <source>Uzbek</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Venda">
-        <source>Venda</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Vietnamese">
-        <source>Vietnamese</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Walloon">
-        <source>Walloon</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Wolof">
-        <source>Wolof</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Xhosa">
-        <source>Xhosa</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Yiddish">
-        <source>Yiddish</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Yoruba">
-        <source>Yoruba</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Zhuang">
-        <source>Zhuang</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Chinese">
-        <source>Chinese</source>
-        <target>undefined</target>
-      </trans-unit>
-      <trans-unit id="Zulu">
-        <source>Zulu</source>
-        <target>undefined</target>
-      </trans-unit>
       <trans-unit id="Misc">
         <source>Misc</source>
         <target>undefined</target>
diff --git a/client/src/locale/target/angular_es_ES.xml b/client/src/locale/target/angular_es_ES.xml
new file mode 100644
index 000000000..ae816930d
--- /dev/null
+++ b/client/src/locale/target/angular_es_ES.xml
@@ -0,0 +1,16 @@
+<?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="es-ES">
+    <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>
+    </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 737c723ee..1a3870481 100644
--- a/client/src/locale/target/angular_fr_FR.xml
+++ b/client/src/locale/target/angular_fr_FR.xml
@@ -76,7 +76,7 @@
         <source>
           or create an account
         </source>
-        <target>ou créer un compte</target>
+        <target>\nou créer un compte</target>
         <context-group name="null">
           <context context-type="linenumber">16</context>
         </context-group>
@@ -85,7 +85,7 @@
         <source>
           or create an account on another instance
         </source>
-        <target>ou créer un compte sur une autre instance</target>
+        <target>\nou créer un compte sur une autre instance</target>
         <context-group name="null">
           <context context-type="linenumber">20</context>
         </context-group>
@@ -143,7 +143,7 @@
         <source>
     Reset my password
   </source>
-        <target>Réinitialiser mon mot de passe</target>
+        <target>\nRéinitialiser mon mot de passe</target>
         <context-group name="null">
           <context context-type="linenumber">2</context>
         </context-group>
@@ -173,7 +173,7 @@
         <source>
     Create an account
   </source>
-        <target>Créer un compte</target>
+        <target>\nCréer un compte</target>
         <context-group name="null">
           <context context-type="linenumber">3</context>
         </context-group>
@@ -189,7 +189,7 @@
         <source>
       Unlimited
     </source>
-        <target>Illimité</target>
+        <target>\nIllimité</target>
         <context-group name="null">
           <context context-type="linenumber">16</context>
         </context-group>
@@ -293,15 +293,6 @@
           <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="eee05612e26cfe9527f08c6e74df7dfd84880ae9">
-        <source>
-            My settings
-          </source>
-        <target>Mes paramètres</target>
-        <context-group name="null">
-          <context context-type="linenumber">21</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="6326f9ce2365bfe97668c4aa146fbbb762497c1a">
         <source>
             Log out
@@ -551,7 +542,7 @@
       </trans-unit>
       <trans-unit id="31b3275d999af45fe64c6824e6e017d2e2704f09">
         <source>User default video quota</source>
-        <target>Quota de vidéos par défaut par utilisateur</target>
+        <target>Quota de vidéos par défaut par utilisateur </target>
         <context-group name="null">
           <context context-type="linenumber">122</context>
         </context-group>
@@ -627,56 +618,56 @@ Cochez cette case, sauvegardez la configuration et testez avec l'URL d'une vidé
         <source>Transcoding threads</source>
         <target>Nombre de threads pour l'encodage</target>
         <context-group name="null">
-          <context context-type="linenumber">184</context>
+          <context context-type="linenumber">186</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6aff7f4b4f140702c4ce791cc9990932623862f0">
         <source>Resolution <x id="INTERPOLATION" equiv-text="{{ resolution }}"/> enabled</source>
         <target>Définition <x id="INTERPOLATION" equiv-text="{{ resolution }}"/> activée</target>
         <context-group name="null">
-          <context context-type="linenumber">203</context>
+          <context context-type="linenumber">205</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1fa92c6ce274f878b2625587daa7e08b2a3a8b38">
         <source>Cache</source>
         <target>Cache</target>
         <context-group name="null">
-          <context context-type="linenumber">207</context>
+          <context context-type="linenumber">209</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d00f6c2dcb426440a0a8cd8eec12d094fbfaf6f7">
         <source>Previews cache size</source>
         <target>Taille du cache des prévisualisations </target>
         <context-group name="null">
-          <context context-type="linenumber">210</context>
+          <context context-type="linenumber">212</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bf91318659ada3d3ad1b0ca1e63ae427e5a857d5">
         <source>Previews are not federated. We fetch them directly from the origin instance and cache them.</source>
         <target>Les aperçus ne sont pas fédérés. Nous les récupérons directement de l'instance d'origine, et les cachons.</target>
         <context-group name="null">
-          <context context-type="linenumber">213</context>
+          <context context-type="linenumber">215</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e3a65df2560e99864bbde695da3a7bdf743a184c">
         <source>Customizations</source>
         <target>Personnalisations</target>
         <context-group name="null">
-          <context context-type="linenumber">225</context>
+          <context context-type="linenumber">227</context>
         </context-group>
       </trans-unit>
       <trans-unit id="0da9752916950ce6890d897b835c923a71ad9c5c">
         <source>JavaScript</source>
         <target>JavaScript</target>
         <context-group name="null">
-          <context context-type="linenumber">228</context>
+          <context context-type="linenumber">230</context>
         </context-group>
       </trans-unit>
       <trans-unit id="fda2339a6e6ba017ee43b560caf660ed4022333c">
         <source>Write directly JavaScript code.&lt;br /&gt;Example: &lt;pre&gt;console.log('my instance is amazing');&lt;/pre&gt;</source>
         <target>Écrivez directement du code JavaScript.&lt;br /&gt;Exemple: &lt;pre&gt;console.log('mon instance est super géniale');&lt;/pre&gt;</target>
         <context-group name="null">
-          <context context-type="linenumber">231</context>
+          <context context-type="linenumber">233</context>
         </context-group>
       </trans-unit>
       <trans-unit id="f133b08d6519081bfb8ef51cff4bf2b3af23dde6">
@@ -711,7 +702,7 @@ Cochez cette case, sauvegardez la configuration et testez avec l'URL d'une vidé
               &lt;/pre&gt;
             </target>
         <context-group name="null">
-          <context context-type="linenumber">247</context>
+          <context context-type="linenumber">249</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6c44844ebdb7352c433b7734feaa65f01bb594ab">
@@ -725,7 +716,7 @@ Cochez cette case, sauvegardez la configuration et testez avec l'URL d'une vidé
         <source>Update configuration</source>
         <target>Mettre à jour la configuration</target>
         <context-group name="null">
-          <context context-type="linenumber">274</context>
+          <context context-type="linenumber">276</context>
         </context-group>
       </trans-unit>
       <trans-unit id="80dbb8ba42b97a9ec035c0ba09f45c07ea07096c">
@@ -1368,35 +1359,35 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
         <source>Upload thumbnail</source>
         <target>Téléverser une vignette</target>
         <context-group name="null">
-          <context context-type="linenumber">119</context>
+          <context context-type="linenumber">129</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9df3f57e251c077bef7e7da81677cb971c55b639">
         <source>Upload preview</source>
         <target>Téléverser un aperçu</target>
         <context-group name="null">
-          <context context-type="linenumber">126</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit>
       <trans-unit id="b5629d298ff1a69b8db19a4ba2995c76b52da604">
         <source>Support</source>
         <target>Soutenir</target>
         <context-group name="null">
-          <context context-type="linenumber">53</context>
+          <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
       <trans-unit id="f61f989de6fc12f99369a90800e4b5462d3f10a0">
         <source>Short text to tell people how they can support you (membership platform...).</source>
         <target>Courte description des moyens qu'ont les utilisateurs de vous soutenir (financement participatif, etc.).</target>
         <context-group name="null">
-          <context context-type="linenumber">133</context>
+          <context context-type="linenumber">143</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d91da0abc638c05e52adea253d0813f3584da4b1">
         <source>Advanced settings</source>
         <target>Paramétrage avancé</target>
         <context-group name="null">
-          <context context-type="linenumber">115</context>
+          <context context-type="linenumber">125</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c07377d8b52fde03fcf70824a980346b9222d056">
@@ -1421,7 +1412,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
         <source>Update</source>
         <target>Mettre à jour</target>
         <context-group name="null">
-          <context context-type="linenumber">87</context>
+          <context context-type="linenumber">89</context>
         </context-group>
       </trans-unit>
       <trans-unit id="9aafb2a928664aa7a9375fd37c533f0375f8b611">
@@ -1449,7 +1440,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
         <source>Download</source>
         <target>Télécharger</target>
         <context-group name="null">
-          <context context-type="linenumber">69</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
       <trans-unit id="11749f4fc0aa1b5e37f38575e4d4e3b1b7e0e96b">
@@ -1488,7 +1479,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
         <source>Share</source>
         <target>Partager</target>
         <context-group name="null">
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">60</context>
         </context-group>
       </trans-unit>
       <trans-unit id="801b98c6f02fe3b32f6afa3ee854c99ed83474e6">
@@ -1516,13 +1507,6 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
           <context context-type="linenumber">35</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5f60990802486b7906b422d80aace6a1b19dcc02">
-        <source>Video not found :'(</source>
-        <target>Vidéo non trouvée :'(</target>
-        <context-group name="null">
-          <context context-type="linenumber">6</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
@@ -1530,91 +1514,77 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
         <target>
             <x id="INTERPOLATION" equiv-text="{{ video.publishedAt | myFromNow }}"/> - <x id="INTERPOLATION_1" equiv-text="{{ video.views | myNumberFormatter }}"/> vues          </target>
         <context-group name="null">
-          <context context-type="linenumber">15</context>
+          <context context-type="linenumber">17</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5cb397241041f7ad70997806227bafcdf7eb1b33">
         <source>Go the channel page</source>
         <target>Aller à la page de chaîne</target>
         <context-group name="null">
-          <context context-type="linenumber">20</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="912f005563d20191efc188dccedd35a7c4e6b396">
-        <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.displayName}}"/>@<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>Vous pouvez vous abonner à ce compte avec n'importe quel instance compatible ActivityPub. Par exemple, avec Mastodon ou Pleroma, vous pouvez taper dans le champ de recherche &lt;strong&gt;@<x id="INTERPOLATION" equiv-text="{{video.account.displayName}}"/>@<x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/>&lt;/strong&gt; pour ensuite vous abonner à lui. L'abonnement en tant qu'utilisateur PeerTube est travaillé dans &lt;a href='https://github.com/Chocobozzz/PeerTube/issues/470'&gt;#470&lt;/a&gt;.</target>
-        <context-group name="null">
-          <context context-type="linenumber">24</context>
+          <context context-type="linenumber">22</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ccc07df383b7a32be3e2e105faa5488caf261c1c">
         <source>By <x id="INTERPOLATION" equiv-text="{{ video.by }}"/></source>
         <target>Par <x id="INTERPOLATION" equiv-text="{{ video.by }}"/></target>
         <context-group name="null">
-          <context context-type="linenumber">29</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="e88300c71e0cb0f346d5a72eb37c920f2aadae8a">
-        <source>Go the account page</source>
-        <target>Aller sur la page du compte</target>
-        <context-group name="null">
-          <context context-type="linenumber">28</context>
+          <context context-type="linenumber">31</context>
         </context-group>
       </trans-unit>
       <trans-unit id="82b59049f3f89d900c98da9319e156dd513e3ced">
         <source>Like this video</source>
         <target>J'aime cette vidéo</target>
         <context-group name="null">
-          <context context-type="linenumber">41</context>
+          <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
       <trans-unit id="623698f075025b2b2fc2e0c59fd95f4f4662a509">
         <source>Dislike this video</source>
         <target>Je n'aime pas cette vidéo</target>
         <context-group name="null">
-          <context context-type="linenumber">48</context>
+          <context context-type="linenumber">50</context>
         </context-group>
       </trans-unit>
       <trans-unit id="144fff5c40b85414d59e644d8dee7cfefba925a2">
         <source>Download the video</source>
         <target>Télécharger la vidéo</target>
         <context-group name="null">
-          <context context-type="linenumber">68</context>
+          <context context-type="linenumber">70</context>
         </context-group>
       </trans-unit>
       <trans-unit id="f72992030f134408b675152c397f9d0ec00f3b2a">
         <source>Report</source>
         <target>Signaler</target>
         <context-group name="null">
-          <context context-type="linenumber">75</context>
+          <context context-type="linenumber">77</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2f4894617d9c44010f87473e583bd4604b7d6ecf">
         <source>Report this video</source>
         <target>Signaler cette vidéo</target>
         <context-group name="null">
-          <context context-type="linenumber">74</context>
+          <context context-type="linenumber">76</context>
         </context-group>
       </trans-unit>
       <trans-unit id="007ab5fa2aae8a7372307d3fc45a2dbcb11ffd61">
         <source>Blacklist</source>
         <target>Blacklister</target>
         <context-group name="null">
-          <context context-type="linenumber">81</context>
+          <context context-type="linenumber">83</context>
         </context-group>
       </trans-unit>
       <trans-unit id="803c6317abd2dbafcc93226c4e273c62932e3037">
         <source>Blacklist this video</source>
         <target>Blacklister cette vidéo</target>
         <context-group name="null">
-          <context context-type="linenumber">80</context>
+          <context context-type="linenumber">82</context>
         </context-group>
       </trans-unit>
       <trans-unit id="cd27f761b923a5bdb16ba9844da632edd878f1b1">
         <source>Update this video</source>
         <target>Mettre à jour cette vidéo</target>
         <context-group name="null">
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
       <trans-unit id="826b25211922a1b46436589233cb6f1a163d89b7">
@@ -1628,21 +1598,21 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
         <source>Delete this video</source>
         <target>Supprimer cette vidéo</target>
         <context-group name="null">
-          <context context-type="linenumber">92</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit id="f0c5f6f270e70cbe063b5368fcf48f9afc1abd9b">
         <source>Show more</source>
         <target>Voir plus</target>
         <context-group name="null">
-          <context context-type="linenumber">112</context>
+          <context context-type="linenumber">114</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5403a767248e304199592271bba3366d2ca3f903">
         <source>Show less</source>
         <target>Montrer moins</target>
         <context-group name="null">
-          <context context-type="linenumber">118</context>
+          <context context-type="linenumber">120</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8057a9b7f9e908ff350edfd71417b96c174e5911">
@@ -1651,7 +1621,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
           </source>
         <target>Visibilité</target>
         <context-group name="null">
-          <context context-type="linenumber">125</context>
+          <context context-type="linenumber">127</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bd407eca607a8905a26a9e30c9d0cd70f4465db8">
@@ -1660,7 +1630,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
           </source>
         <target>Catégorie</target>
         <context-group name="null">
-          <context context-type="linenumber">134</context>
+          <context context-type="linenumber">136</context>
         </context-group>
       </trans-unit>
       <trans-unit id="af5072bd79ea3cd767ab74a6622d2eee791b3832">
@@ -1671,7 +1641,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
             Licence
           </target>
         <context-group name="null">
-          <context context-type="linenumber">143</context>
+          <context context-type="linenumber">145</context>
         </context-group>
       </trans-unit>
       <trans-unit id="a911eee019174741b0aec6fcf3fbd5752fab3e67">
@@ -1682,7 +1652,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
             Langue
           </target>
         <context-group name="null">
-          <context context-type="linenumber">152</context>
+          <context context-type="linenumber">154</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ecf7007c2842cc26a7b91d08d48c7a4f5f749fb3">
@@ -1691,7 +1661,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
           </source>
         <target>Étiquettes</target>
         <context-group name="null">
-          <context context-type="linenumber">161</context>
+          <context context-type="linenumber">163</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7ce8b0d7cc34d4c1ef4a21e990b0a001337bedd1">
@@ -1702,14 +1672,14 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
         Autres vidéos
       </target>
         <context-group name="null">
-          <context context-type="linenumber">175</context>
+          <context context-type="linenumber">177</context>
         </context-group>
       </trans-unit>
       <trans-unit id="fb779d2b25c4d0ffa7d52c823a240717e8c1fe6c">
         <source>Friendly Reminder:</source>
         <target>Rappel:</target>
         <context-group name="null">
-          <context context-type="linenumber">187</context>
+          <context context-type="linenumber">189</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4c2fca29fd9d7e85abe85a206958a4226f403be2">
@@ -1720,21 +1690,21 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
         Le système de partage utilisé par cette vidéo nécessite que des informations techniques concernant votre système (notamment votre adresse IP publique) soit rendue publique.
       </target>
         <context-group name="null">
-          <context context-type="linenumber">189</context>
+          <context context-type="linenumber">191</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e60c11e1b1dfbbeda577364b8de39ded2d796c5e">
         <source>More information</source>
         <target>Plus d'informations</target>
         <context-group name="null">
-          <context context-type="linenumber">192</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bd499ca7913bb5408fd139a4cb4f863852d5f318">
         <source>Get more information</source>
         <target>Obtenir plus d'informations</target>
         <context-group name="null">
-          <context context-type="linenumber">192</context>
+          <context context-type="linenumber">194</context>
         </context-group>
       </trans-unit>
       <trans-unit id="20fc98888baf65b5ba9fe9622dc036fa8dec6a5f">
@@ -1745,7 +1715,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
       OK
     </target>
         <context-group name="null">
-          <context context-type="linenumber">195</context>
+          <context context-type="linenumber">197</context>
         </context-group>
       </trans-unit>
       <trans-unit id="b5f5df598f2d75640849b2a7744f91e5dbd390e7">
@@ -1757,25 +1727,18 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
           <context context-type="linenumber">3</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="4b1a394a3d619606f79b1051b1493e6b743a072d">
-        <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.displayName}}"/>@<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>Vous pouvez soit commenter sur la page de l'instance où cette vidéo est fédérée avec votre compte PeerTube, ou via n'importe quelle instance utilisant ActivityPub pour l'échange de messages. Par exemple avec une instance Mastodon ou Pleroma vous pouvez copier l'URL de vidéo dans le champs de recherche, ou écrire &lt;strong&gt;@<x id="INTERPOLATION" equiv-text="{{video.account.displayName}}"/>@<x id="INTERPOLATION_1" equiv-text="{{video.account.host}}"/>&lt;/strong&gt; et retrouver la vidéo. Nous travaillons à la possibilité de commenter directement depuis PeerTube avec un compte distant sur &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>
-      </trans-unit>
       <trans-unit id="17810e68b0ba21e62e61eecfaf0a93b2c91033b4">
         <source>No comments.</source>
         <target>Aucun commentaire.</target>
         <context-group name="null">
-          <context context-type="linenumber">20</context>
+          <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit>
       <trans-unit id="69c081796209e45e26af91152ec9bd0a65ec261e">
         <source>View all <x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/> replies</source>
         <target>Voir les <x id="INTERPOLATION" equiv-text="{{ comment.totalReplies }}"/> réponses</target>
         <context-group name="null">
-          <context context-type="linenumber">56</context>
+          <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
       <trans-unit id="b7fccd922d6473725247ed85a9fdf96fe6794828">
@@ -1786,7 +1749,7 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
     Les commentaires sont désactivés.
   </target>
         <context-group name="null">
-          <context context-type="linenumber">65</context>
+          <context context-type="linenumber">64</context>
         </context-group>
       </trans-unit>
       <trans-unit id="db79255cb8757e9e945ba5f901a2b67e4189016e">
@@ -2122,6 +2085,13 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="d39a0bfa616a9a8473b2e379eefe17d8ed1af118">
+        <source>Video <x id="INTERPOLATION" equiv-text="{{videoName}}"/> deleted.</source>
+        <target>La vidéo <x id="INTERPOLATION" equiv-text="{{videoName}}"/> a été supprimée.</target>
+        <context-group name="null">
+          <context context-type="linenumber">1</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="814d28bf9dcbd3122254e664b446ac8e0442bc08">
         <source>Error getting about from server</source>
         <target>Erreur lors de la récupération des informations 'about'  du serveur</target>
@@ -2845,13 +2815,6 @@ Quand vous mettrez en ligne une vidéo sur cette chaîne, la vidéo affichera au
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="d39a0bfa616a9a8473b2e379eefe17d8ed1af118">
-        <source>Video <x id="INTERPOLATION" equiv-text="{{videoName}}"/> deleted.</source>
-        <target>La vidéo <x id="INTERPOLATION" equiv-text="{{videoName}}"/> a été supprimée.</target>
-        <context-group name="null">
-          <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>
         <target><x id="INTERPOLATION" equiv-text="{{likesNumber}}"/> j'aime / <x id="INTERPOLATION_1" equiv-text="{{dislikesNumber}}"/> je n'aime pas</target>
diff --git a/client/src/locale/target/server_fr_FR.json b/client/src/locale/target/server_fr_FR.json
index 43216adf4..72f6e322d 100644
--- a/client/src/locale/target/server_fr_FR.json
+++ b/client/src/locale/target/server_fr_FR.json
@@ -1 +1 @@
-{"Music":"Musique","Films":"Films","Vehicles":"Transport","Art":"Art","Sports":"Sports","Travels":"Voyages","Gaming":"Jeux vidéos","People":"People","Comedy":"Humour","Entertainment":"Divertissement","News":"Actualités","How To":"Tutoriel","Education":"Éducation","Activism":"Activisme","Science & Technology":"Science & Technologie","Animals":"Animaux","Kids":"Enfants","Food":"Cuisine","Attribution":"Attribution","Attribution - Share Alike":"Attribution - Partage dans les mêmes conditions","Attribution - No Derivatives":"Attribution - Pas d'oeuvre dérivée","Attribution - Non Commercial":"Attribution - Utilisation non commerciale","Attribution - Non Commercial - Share Alike":"Attribution - Utilisation non commerciale - Partage dans les mêmes conditions","Attribution - Non Commercial - No Derivatives":"Attribution - Utilisation non commerciale - Pas d'oeuvre dérivée","Public Domain Dedication":"Domaine public","Public":"Publique","Unlisted":"Non listée","Private":"Privée","French":"Français","French Sign Language":"Langage des signes français","Misc":"Divers","Unknown":"Inconnu"}
\ No newline at end of file
+{"Music":"Musiques","Films":"Films","Vehicles":"Transport","Art":"Art","Sports":"Sports","Travels":"Voyages","Gaming":"Jeux vidéos","People":"Personnalités","Comedy":"Humour","Entertainment":"Divertissement","News":"Actualités","How To":"Tutoriels","Education":"Éducation","Activism":"Militantisme","Science & Technology":"Science & Technologie","Animals":"Animaux","Kids":"Enfants","Food":"Cuisine","Attribution":"Attribution","Attribution - Share Alike":"Attribution - Partage dans les mêmes conditions","Attribution - No Derivatives":"Attribution - Pas d'oeuvre dérivée","Attribution - Non Commercial":"Attribution - Utilisation non commerciale","Attribution - Non Commercial - Share Alike":"Attribution - Utilisation non commerciale - Partage dans les mêmes conditions","Attribution - Non Commercial - No Derivatives":"Attribution - Utilisation non commerciale - Pas d'oeuvre dérivée","Public Domain Dedication":"Domaine public","Public":"Publique","Unlisted":"Non listée","Private":"Privée","Misc":"Divers","Unknown":"Inconnu","Arabic":"Arabe"}
\ No newline at end of file
diff --git a/scripts/i18n/create-custom-files.ts b/scripts/i18n/create-custom-files.ts
index 3519afd47..7d994a710 100755
--- a/scripts/i18n/create-custom-files.ts
+++ b/scripts/i18n/create-custom-files.ts
@@ -34,10 +34,6 @@ values(VIDEO_CATEGORIES)
   .concat(values(VIDEO_PRIVACIES))
   .forEach(v => serverKeys[v] = v)
 
-// ISO 639 keys
-const languages = buildLanguages()
-Object.keys(languages).forEach(k => serverKeys[languages[k]] = languages[k])
-
 // More keys
 Object.assign(serverKeys, {
   'Misc': 'Misc',
@@ -49,13 +45,27 @@ const serverTranslations = {
   data: serverKeys
 }
 
+// ISO 639 keys
+const languageKeys: any = {}
+const languages = buildLanguages()
+Object.keys(languages).forEach(k => languageKeys[languages[k]] = languages[k])
+
+const iso639Translations = {
+  target: join(__dirname, '../../../client/src/locale/source/iso639_en_US.xml'),
+  data: languageKeys
+}
+
 saveToXliffFile(playerTranslations, err => {
   if (err) return handleError(err)
 
   saveToXliffFile(serverTranslations, err => {
     if (err) return handleError(err)
 
-    process.exit(0)
+    saveToXliffFile(iso639Translations, err => {
+      if (err) return handleError(err)
+
+      process.exit(0)
+    })
   })
 })
 
diff --git a/scripts/i18n/xliff2json.ts b/scripts/i18n/xliff2json.ts
index c60739561..17c73181b 100755
--- a/scripts/i18n/xliff2json.ts
+++ b/scripts/i18n/xliff2json.ts
@@ -1,7 +1,7 @@
 import * as xliff12ToJs from 'xliff/xliff12ToJs'
-import { unlink, readFileSync, writeFile } from 'fs'
+import { readFile, readFileSync, unlink, writeFile } from 'fs'
 import { join } from 'path'
-import { buildFileLocale, I18N_LOCALES, isDefaultLocale, LOCALE_FILES } from '../../shared/models/i18n/i18n'
+import { buildFileLocale, I18N_LOCALES, isDefaultLocale } from '../../shared/models/i18n/i18n'
 import { eachSeries } from 'async'
 
 const sources: string[] = []
@@ -9,7 +9,7 @@ const availableLocales = Object.keys(I18N_LOCALES)
                                .filter(l => isDefaultLocale(l) === false)
                                .map(l => buildFileLocale(l))
 
-for (const file of LOCALE_FILES) {
+for (const file of [ 'player', 'server', 'iso639' ]) {
   for (const locale of availableLocales) {
     sources.push(join(__dirname, '../../../client/src/locale/target/', `${file}_${locale}.xml`))
   }
@@ -20,7 +20,11 @@ eachSeries(sources, (source, cb) => {
 }, err => {
   if (err) return handleError(err)
 
-  process.exit(0)
+  mergeISO639InServer(err => {
+    if (err) return handleError(err)
+
+    process.exit(0)
+  })
 })
 
 function handleError (err: any) {
@@ -48,6 +52,28 @@ function xliffFile2JSON (filePath: string, cb) {
   })
 }
 
+function mergeISO639InServer (cb) {
+  eachSeries(availableLocales, (locale, eachCallback) => {
+    const serverPath = join(__dirname, '../../../client/src/locale/target/', `server_${locale}.json`)
+    const iso639Path = join(__dirname, '../../../client/src/locale/target/', `iso639_${locale}.json`)
+
+    const resServer = readFileSync(serverPath).toString()
+    const resISO639 = readFileSync(iso639Path).toString()
+
+    const jsonServer = JSON.parse(resServer)
+    const jsonISO639 = JSON.parse(resISO639)
+
+    Object.assign(jsonServer, jsonISO639)
+    const serverString = JSON.stringify(jsonServer)
+
+    writeFile(serverPath, serverString, err => {
+      if (err) return eachCallback(err)
+
+      return unlink(iso639Path, eachCallback)
+    })
+  }, cb)
+}
+
 function removeFirstLine (str: string) {
   return str.substring(str.indexOf('\n') + 1)
 }
diff --git a/support/doc/development/localization.md b/support/doc/development/localization.md
index 3cf797516..97e9e2c51 100644
--- a/support/doc/development/localization.md
+++ b/support/doc/development/localization.md
@@ -8,7 +8,7 @@ Will generate XLIFF files for Angular and escape inner elements in `source` tag
 
 This script will create `player_en_US.xml` XLIFF file using custom strings (VideoJS plugins) and strings from `videojs_en_US.json` file.
 
-It will also create `server_en_US.xml` XLIFF file using custom strings (defined inside the script, we did not find a way to extract them from TypeScript server files).
+It will also create `server_en_US.xml` and `iso639_en_US.xml` XLIFF file using server strings and custom strings (defined inside the script, we did not find a way to extract them from TypeScript server files).
 
 ```
 $ npm run i18n:generate
@@ -25,7 +25,8 @@ $ zanata-cli push
 ## Pull translation
 
 Pull XLIFF files from Zanata, and unescape them (so we retrieve inner elements in `source` tag, used by Angular).
-A hook converts `player` and `server` translation files to JSON (needed by Video.JS, and our application to have efficient runtime translation).
+A hook converts `player` and `server`, `iso639` translation files to JSON (needed by Video.JS, and our application to have efficient runtime translation).
+Then, `iso639` files will be merged in `server` files (so we have only one JSON file to serve server translations).
 
 ```
 $ zanata-cli pull