diff --git a/client/src/locale/target/angular_ar_001.xml b/client/src/locale/target/angular_ar_001.xml
index 386d190ff..05e55793d 100644
--- a/client/src/locale/target/angular_ar_001.xml
+++ b/client/src/locale/target/angular_ar_001.xml
@@ -883,8 +883,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="bd29138e1e17572596ce8f2fe61bcea6ac5fb0bf">
-        <source>PeerTube is a federated (ActivityPub) video streaming platform using P2P (WebTorrent) directly in the web browser.</source>
-        <context-group name="null">
+        <source>PeerTube is a federated (ActivityPub) video streaming platform using P2P (WebTorrent) directly in the web browser.</source><target>PeerTube is a federated (ActivityPub) video streaming platform using P2P (WebTorrent) directly in the web browser.</target><context-group name="null">
           <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit>
diff --git a/client/src/locale/target/angular_de_DE.xml b/client/src/locale/target/angular_de_DE.xml
index c49c6d701..46e622908 100644
--- a/client/src/locale/target/angular_de_DE.xml
+++ b/client/src/locale/target/angular_de_DE.xml
@@ -1278,32 +1278,27 @@ Konto erstellen</target>
         </context-group>
       </trans-unit>
       <trans-unit id="bd2edf99dd6562385ccec19a7ab2d1898e626605">
-        <source>Banned</source>
-        <context-group name="null">
+        <source>Banned</source><target>Banned</target><context-group name="null">
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
       <trans-unit id="62a557fcfdbd25a31d1a0332294f94a466fee809">
-        <source>Muted</source>
-        <context-group name="null">
+        <source>Muted</source><target>Muted</target><context-group name="null">
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
       <trans-unit id="48bbf6dbdb22e0ef4bd257eae2ab356f2ea66c89">
-        <source>Muted by your instance</source>
-        <context-group name="null">
+        <source>Muted by your instance</source><target>Muted by your instance</target><context-group name="null">
           <context context-type="linenumber">14</context>
         </context-group>
       </trans-unit>
       <trans-unit id="44bd08a7ec1e407356620967d65d8fe2d8639d0a">
-        <source>Instance muted</source>
-        <context-group name="null">
+        <source>Instance muted</source><target>Instance muted</target><context-group name="null">
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1a6443bb7ed01046dd83cf78806f795f1204ffa1">
-        <source>Instance muted by your instance</source>
-        <context-group name="null">
+        <source>Instance muted by your instance</source><target>Instance muted by your instance</target><context-group name="null">
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
@@ -1968,8 +1963,7 @@ Konto erstellen</target>
         </context-group>
       </trans-unit>
       <trans-unit id="adba7c8b43e42581460fbe5d08b5cb5ab60eba4b">
-        <source>(banned)</source>
-        <context-group name="null">
+        <source>(banned)</source><target>(banned)</target><context-group name="null">
           <context context-type="linenumber">65</context>
         </context-group>
       </trans-unit>
@@ -2118,14 +2112,12 @@ Konto erstellen</target>
         </context-group>
       </trans-unit>
       <trans-unit id="b1ff109b26ae8f08650415454b9098c43eba2e2c">
-        <source>Muted accounts</source>
-        <context-group name="null">
+        <source>Muted accounts</source><target>Muted accounts</target><context-group name="null">
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bd0611346af048015e0a1275091ef68ce98832d2">
-        <source>Muted servers</source>
-        <context-group name="null">
+        <source>Muted servers</source><target>Muted servers</target><context-group name="null">
           <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
@@ -2137,14 +2129,12 @@ Konto erstellen</target>
         </context-group>
       </trans-unit>
       <trans-unit id="079e99cce11c87b142e80fdd14dae98a61012fc4">
-        <source>Muted at <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></source>
-        <context-group name="null">
+        <source>Muted at <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></source><target>Muted at <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></target><context-group name="null">
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1f689fada9748a830117f5b429a88ef8629082a8">
-        <source>Unmute</source>
-        <context-group name="null">
+        <source>Unmute</source><target>Unmute</target><context-group name="null">
           <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
@@ -2191,8 +2181,7 @@ Konto erstellen</target>
         </context-group>
       </trans-unit>
       <trans-unit id="2bc7533f8c8e7d183950ba1094a0acd9efc22e5e">
-        <source>Muted instances</source>
-        <context-group name="null">
+        <source>Muted instances</source><target>Muted instances</target><context-group name="null">
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit>
@@ -3679,8 +3668,7 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa
         </context-group>
       </trans-unit>
       <trans-unit id="53cc0f4a4566c4139c65f93b5dce2fe8302e78da">
-        <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by your instance.</source>
-        <context-group name="null">
+        <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by your instance.</source><target>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by your instance.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -3776,8 +3764,7 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa
         </context-group>
       </trans-unit>
       <trans-unit id="9de914fe915cc730efc57e81c987188a24d3ac51">
-        <source>If you remove these users, you will not be able to create others with the same username!</source>
-        <context-group name="null">
+        <source>If you remove these users, you will not be able to create others with the same username!</source><target>If you remove these users, you will not be able to create others with the same username!</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -3992,8 +3979,7 @@ Wenn du ein Video in diesen Kanal hochlädst, wird das entsprechende Feld automa
         </context-group>
       </trans-unit>
       <trans-unit id="ff6becacbce7fc0943b0af0df4dd67e5e11bf598">
-        <source>Subscribe to the account</source>
-        <context-group name="null">
+        <source>Subscribe to the account</source><target>Subscribe to the account</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
diff --git a/client/src/locale/target/angular_fa_IR.xml b/client/src/locale/target/angular_fa_IR.xml
index fbef34713..fe2d0b0cf 100644
--- a/client/src/locale/target/angular_fa_IR.xml
+++ b/client/src/locale/target/angular_fa_IR.xml
@@ -377,8 +377,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="08c74dc9762957593b91f6eb5d65efdfc975bf48">
-        <source>Username</source>
-        <context-group name="null">
+        <source>Username</source><target>Username</target><context-group name="null">
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit>
@@ -529,8 +528,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="cf75021ac8cb9efd4f95e8880cf52c9acd265768">
-        <source>Toggle dark interface</source>
-        <context-group name="null">
+        <source>Toggle dark interface</source><target>Toggle dark interface</target><context-group name="null">
           <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
@@ -764,14 +762,12 @@
         </context-group>
       </trans-unit>
       <trans-unit id="873b72903b1858a9cd6c8967521030b4d7d1435b">
-        <source>State</source>
-        <context-group name="null">
+        <source>State</source><target>State</target><context-group name="null">
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d29764bcbaad3ef69b6be92be35bdf25972ce246">
-        <source>Follow</source>
-        <context-group name="null">
+        <source>Follow</source><target>Follow</target><context-group name="null">
           <context context-type="linenumber">7</context>
         </context-group>
       </trans-unit>
diff --git a/client/src/locale/target/angular_it_IT.xml b/client/src/locale/target/angular_it_IT.xml
index 2f98b52dc..dea48b4a7 100644
--- a/client/src/locale/target/angular_it_IT.xml
+++ b/client/src/locale/target/angular_it_IT.xml
@@ -1857,8 +1857,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="4fa08915c99629d38c9da8a08b1985a7f4e38e40">
-        <source>Finished on</source>
-        <context-group name="null">
+        <source>Finished on</source><target>Finished on</target><context-group name="null">
           <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
@@ -1921,14 +1920,12 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ea762ca1d74c96d8568ac68482778f52ca531cc4">
-        <source>Batch actions</source>
-        <context-group name="null">
+        <source>Batch actions</source><target>Batch actions</target><context-group name="null">
           <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit>
       <trans-unit id="08ea8692dc2a7050026df26fc39b22960bde9de5">
-        <source>Username <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></source>
-        <context-group name="null">
+        <source>Username <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></source><target>Username <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></target><context-group name="null">
           <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
@@ -1979,8 +1976,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="2bf5a31043ff476ca081a4080f3f3f17518dc6f2">
-        <source>Reporter</source>
-        <context-group name="null">
+        <source>Reporter</source><target>Reporter</target><context-group name="null">
           <context context-type="linenumber">8</context>
         </context-group>
       </trans-unit>
@@ -2712,8 +2708,7 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
       </trans-unit>
       <trans-unit id="6bad752cfcac8f3572bdf2c619daec683d56d1a8">
-        <source>Select the caption file</source>
-        <context-group name="null">
+        <source>Select the caption file</source><target>Select the caption file</target><context-group name="null">
           <context context-type="linenumber">24</context>
         </context-group>
       </trans-unit>
@@ -2806,14 +2801,12 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
       </trans-unit>
       <trans-unit id="7e549f41b715552ffe69b85c14a690d9d81c85f0">
-        <source>Wait transcoding before publishing the video</source>
-        <context-group name="null">
+        <source>Wait transcoding before publishing the video</source><target>Wait transcoding before publishing the video</target><context-group name="null">
           <context context-type="linenumber">130</context>
         </context-group>
       </trans-unit>
       <trans-unit id="24f468ce1148a096477d8dd0d00f0d1fd88d6c63">
-        <source>If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends.</source>
-        <context-group name="null">
+        <source>If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends.</source><target>If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends.</target><context-group name="null">
           <context context-type="linenumber">131</context>
         </context-group>
       </trans-unit>
@@ -2853,8 +2846,7 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
       </trans-unit>
       <trans-unit id="0c720e0dd9e6c60095f961cb714f47e8c0090f93">
-        <source>Captions</source>
-        <context-group name="null">
+        <source>Captions</source><target>Captions</target><context-group name="null">
           <context context-type="linenumber">139</context>
         </context-group>
       </trans-unit>
@@ -2866,8 +2858,7 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
       </trans-unit>
       <trans-unit id="9df3f57e251c077bef7e7da81677cb971c55b639">
-        <source>Upload preview</source>
-        <context-group name="null">
+        <source>Upload preview</source><target>Upload preview</target><context-group name="null">
           <context context-type="linenumber">202</context>
         </context-group>
       </trans-unit>
@@ -2879,8 +2870,7 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
       </trans-unit>
       <trans-unit id="f61f989de6fc12f99369a90800e4b5462d3f10a0">
-        <source>Short text to tell people how they can support you (membership platform...).</source>
-        <context-group name="null">
+        <source>Short text to tell people how they can support you (membership platform...).</source><target>Short text to tell people how they can support you (membership platform...).</target><context-group name="null">
           <context context-type="linenumber">209</context>
         </context-group>
       </trans-unit>
@@ -2967,14 +2957,12 @@ When you will upload a video in this channel, the video support field will be au
         </context-group>
       </trans-unit>
       <trans-unit id="e0cfbc8ea680e4527ebf094c035f3342e9146d9f">
-        <source>QR-Code</source>
-        <context-group name="null">
+        <source>QR-Code</source><target>QR-Code</target><context-group name="null">
           <context context-type="linenumber">29</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d3b15c3bf4a7ea38d6002d2d2c4781642d30e79c">
-        <source>Embed</source>
-        <context-group name="null">
+        <source>Embed</source><target>Embed</target><context-group name="null">
           <context context-type="linenumber">34</context>
         </context-group>
       </trans-unit>
@@ -3310,8 +3298,7 @@ Altri video</target>
         </context-group>
       </trans-unit>
       <trans-unit id="1e035e6ccfab771cad4226b2ad230cb0d4a88cba">
-        <source>Success</source>
-        <context-group name="null">
+        <source>Success</source><target>Success</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -3456,8 +3443,7 @@ Altri video</target>
         </context-group>
       </trans-unit>
       <trans-unit id="6a7938b8780c27540ea70cc0f8f4d928c8916cf9">
-        <source>Abuse deleted.</source>
-        <context-group name="null">
+        <source>Abuse deleted.</source><target>Abuse deleted.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -3504,8 +3490,7 @@ Altri video</target>
         </context-group>
       </trans-unit>
       <trans-unit id="ac401df84c5fa471700c3368de51c969ccb8bacf">
-        <source>You cannot ban root.</source>
-        <context-group name="null">
+        <source>You cannot ban root.</source><target>You cannot ban root.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -3517,8 +3502,7 @@ Altri video</target>
         </context-group>
       </trans-unit>
       <trans-unit id="507192ee1fa84aefed02d603caada2d84927023e">
-        <source>Ownership accepted</source>
-        <context-group name="null">
+        <source>Ownership accepted</source><target>Ownership accepted</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -3677,14 +3661,12 @@ Altri video</target>
         </context-group>
       </trans-unit>
       <trans-unit id="21f1c9d5c67346c830aced4f670045fcf0aeb83a">
-        <source>To transcode</source>
-        <context-group name="null">
+        <source>To transcode</source><target>To transcode</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="289fe8342e8b7df689c75026a24a60fd7f5e9392">
-        <source>To import</source>
-        <context-group name="null">
+        <source>To import</source><target>To import</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -4097,14 +4079,12 @@ Altri video</target>
         </context-group>
       </trans-unit>
       <trans-unit id="bdeb1a8e69e137572df795d64120ea85069b7674">
-        <source>Display name must be at least 3 characters long.</source>
-        <context-group name="null">
+        <source>Display name must be at least 3 characters long.</source><target>Display name must be at least 3 characters long.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e81bda510399d52f26a44a15c3dbf4d6205d90a9">
-        <source>Display name cannot be more than 120 characters long.</source>
-        <context-group name="null">
+        <source>Display name cannot be more than 120 characters long.</source><target>Display name cannot be more than 120 characters long.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -4697,14 +4677,12 @@ Altri video</target>
         </context-group>
       </trans-unit>
       <trans-unit id="344ddae9f45b344e98e7b28cd5e33243982700f8">
-        <source><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of HD videos</source>
-        <context-group name="null">
+        <source><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of HD videos</source><target><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of HD videos</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="435c012df6dd990a1ccb7ee73dd79c488bde28b5">
-        <source><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of average quality videos</source>
-        <context-group name="null">
+        <source><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of average quality videos</source><target><x id="INTERPOLATION" equiv-text="{{seconds}}"/> of average quality videos</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -4828,8 +4806,7 @@ Altri video</target>
         </context-group>
       </trans-unit>
       <trans-unit id="faafee0c03ad25c8a43aa91bd5d98185b67ff734">
-        <source>Do you really want to unban <x id="INTERPOLATION" equiv-text="{{username}}"/>?</source>
-        <context-group name="null">
+        <source>Do you really want to unban <x id="INTERPOLATION" equiv-text="{{username}}"/>?</source><target>Do you really want to unban <x id="INTERPOLATION" equiv-text="{{username}}"/>?</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
diff --git a/client/src/locale/target/angular_ja_JP.xml b/client/src/locale/target/angular_ja_JP.xml
index cb303ad3a..d0b592098 100644
--- a/client/src/locale/target/angular_ja_JP.xml
+++ b/client/src/locale/target/angular_ja_JP.xml
@@ -109,8 +109,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.progressbar.value">
-        <source><x id="INTERPOLATION" equiv-text="{{getPercentValue()}}"/>%</source>
-        <context-group name="null">
+        <source><x id="INTERPOLATION" equiv-text="{{getPercentValue()}}"/>%</source><target><x id="INTERPOLATION" equiv-text="{{getPercentValue()}}"/>%</target><context-group name="null">
           <context context-type="linenumber">6</context>
         </context-group>
       </trans-unit>
@@ -220,8 +219,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="1d19634967b06f93fd7f20c0663742f8254e6d46">
-        <source>(extensions: <x id="INTERPOLATION" equiv-text="{{ allowedExtensionsMessage }}"/>, max size: <x id="INTERPOLATION_1" equiv-text="{{ maxFileSize | bytes }}"/>)</source>
-        <context-group name="null">
+        <source>(extensions: <x id="INTERPOLATION" equiv-text="{{ allowedExtensionsMessage }}"/>, max size: <x id="INTERPOLATION_1" equiv-text="{{ maxFileSize | bytes }}"/>)</source><target>(extensions: <x id="INTERPOLATION" equiv-text="{{ allowedExtensionsMessage }}"/>, max size: <x id="INTERPOLATION_1" equiv-text="{{ maxFileSize | bytes }}"/>)</target><context-group name="null">
           <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
@@ -362,8 +360,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="d2eb6c5d41f70d4b8c0937e7e19e196143b47681">
-        <source>Forgot your password</source>
-        <context-group name="null">
+        <source>Forgot your password</source><target>Forgot your password</target><context-group name="null">
           <context context-type="linenumber">57</context>
         </context-group>
       </trans-unit>
@@ -400,8 +397,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="7f3bdcce4b2e8c37cd7f0f6c92ef8cff34b039b8">
-        <source>Confirm password</source>
-        <context-group name="null">
+        <source>Confirm password</source><target>Confirm password</target><context-group name="null">
           <context context-type="linenumber">19</context>
         </context-group>
       </trans-unit>
@@ -459,8 +455,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="aef5c45fb9c725573d20a6283492e6b80fd2ae96">
-        <source>Change the language</source>
-        <context-group name="null">
+        <source>Change the language</source><target>Change the language</target><context-group name="null">
           <context context-type="linenumber">88</context>
         </context-group>
       </trans-unit>
@@ -520,8 +515,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="b6b7986bc3721ac483baf20bc9a320529075c807">
-        <source>Trending</source>
-        <context-group name="null">
+        <source>Trending</source><target>Trending</target><context-group name="null">
           <context context-type="linenumber">57</context>
         </context-group>
       </trans-unit>
@@ -891,8 +885,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="a33feadefbb776217c2db96100736314f8b765c2">
-        <source>Transcoding threads</source>
-        <context-group name="null">
+        <source>Transcoding threads</source><target>Transcoding threads</target><context-group name="null">
           <context context-type="linenumber">223</context>
         </context-group>
       </trans-unit>
@@ -1658,8 +1651,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="ac401df84c5fa471700c3368de51c969ccb8bacf">
-        <source>You cannot ban root.</source>
-        <context-group name="null">
+        <source>You cannot ban root.</source><target>You cannot ban root.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
diff --git a/client/src/locale/target/angular_jbo.xml b/client/src/locale/target/angular_jbo.xml
index f05bc88c2..83e61a714 100644
--- a/client/src/locale/target/angular_jbo.xml
+++ b/client/src/locale/target/angular_jbo.xml
@@ -480,8 +480,7 @@ lo mi vidvi</target>
         </context-group>
       </trans-unit>
       <trans-unit id="ff78f059449d44322f627d0f66df07abe476962b">
-        <source>Instance</source>
-        <context-group name="null">
+        <source>Instance</source><target>Instance</target><context-group name="null">
           <context context-type="linenumber">12</context>
         </context-group>
       </trans-unit>
diff --git a/client/src/locale/target/angular_nl_NL.xml b/client/src/locale/target/angular_nl_NL.xml
index 00cfcb954..3db9f0504 100644
--- a/client/src/locale/target/angular_nl_NL.xml
+++ b/client/src/locale/target/angular_nl_NL.xml
@@ -1115,8 +1115,7 @@ Als je een video uploadt in dit kanaal, wordt deze tekst ingevuld in het "onders
         </context-group>
       </trans-unit>
       <trans-unit id="fb17c44abac2d1ed2a54cdd28bae289dc0b9a1c2">
-        <source>Automatically plays video</source>
-        <context-group name="null">
+        <source>Automatically plays video</source><target>Automatically plays video</target><context-group name="null">
           <context context-type="linenumber">28</context>
         </context-group>
       </trans-unit>
diff --git a/client/src/locale/target/angular_pl_PL.xml b/client/src/locale/target/angular_pl_PL.xml
index 325dd86f9..fd6e03469 100644
--- a/client/src/locale/target/angular_pl_PL.xml
+++ b/client/src/locale/target/angular_pl_PL.xml
@@ -1061,8 +1061,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="efde279863678ed95a8949a3712c99748bdabfe6">
-        <source>An automatic video redundancy program: we wouldn't know if the IP downloaded the video on purpose or if it was the automatized program</source>
-        <context-group name="null">
+        <source>An automatic video redundancy program: we wouldn't know if the IP downloaded the video on purpose or if it was the automatized program</source><target>An automatic video redundancy program: we wouldn't know if the IP downloaded the video on purpose or if it was the automatized program</target><context-group name="null">
           <context context-type="linenumber">95</context>
         </context-group>
       </trans-unit>
@@ -1123,8 +1122,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="554488d11165f38b27b8fe230aba8a2e30d57003">
-        <source>Default client route</source>
-        <context-group name="null">
+        <source>Default client route</source><target>Default client route</target><context-group name="null">
           <context context-type="linenumber">55</context>
         </context-group>
       </trans-unit>
@@ -1496,8 +1494,7 @@
         </context-group>
       </trans-unit>
       <trans-unit id="873b72903b1858a9cd6c8967521030b4d7d1435b">
-        <source>State</source>
-        <context-group name="null">
+        <source>State</source><target>State</target><context-group name="null">
           <context context-type="linenumber">10</context>
         </context-group>
       </trans-unit>
@@ -2326,8 +2323,7 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
         </context-group>
       </trans-unit>
       <trans-unit id="623698f075025b2b2fc2e0c59fd95f4f4662a509">
-        <source>Dislike this video</source>
-        <context-group name="null">
+        <source>Dislike this video</source><target>Dislike this video</target><context-group name="null">
           <context context-type="linenumber">64</context>
         </context-group>
       </trans-unit>
@@ -3404,8 +3400,7 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
         </context-group>
       </trans-unit>
       <trans-unit id="665092574f9af9fec262f8349b67b14192391ae6">
-        <source>Video support must be at least 3 characters long.</source>
-        <context-group name="null">
+        <source>Video support must be at least 3 characters long.</source><target>Video support must be at least 3 characters long.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -4068,8 +4063,7 @@ Jeżeli umieścisz film na ten kanał, pole informujące o możliwości wsparcia
         </context-group>
       </trans-unit>
       <trans-unit id="d5a4811e15319ad9354e1b62e9ca0131192b489e">
-        <source><x id="INTERPOLATION" equiv-text="{{likesNumber}}"/> likes / <x id="INTERPOLATION_1" equiv-text="{{dislikesNumber}}"/> dislikes</source>
-        <context-group name="null">
+        <source><x id="INTERPOLATION" equiv-text="{{likesNumber}}"/> likes / <x id="INTERPOLATION_1" equiv-text="{{dislikesNumber}}"/> dislikes</source><target><x id="INTERPOLATION" equiv-text="{{likesNumber}}"/> likes / <x id="INTERPOLATION_1" equiv-text="{{dislikesNumber}}"/> dislikes</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
diff --git a/client/src/locale/target/angular_sv_SE.xml b/client/src/locale/target/angular_sv_SE.xml
index 7b4553359..e30575d80 100644
--- a/client/src/locale/target/angular_sv_SE.xml
+++ b/client/src/locale/target/angular_sv_SE.xml
@@ -1319,26 +1319,22 @@
         </context-group>
       </trans-unit>
       <trans-unit id="62a557fcfdbd25a31d1a0332294f94a466fee809">
-        <source>Muted</source>
-        <context-group name="null">
+        <source>Muted</source><target>Muted</target><context-group name="null">
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
       <trans-unit id="48bbf6dbdb22e0ef4bd257eae2ab356f2ea66c89">
-        <source>Muted by your instance</source>
-        <context-group name="null">
+        <source>Muted by your instance</source><target>Muted by your instance</target><context-group name="null">
           <context context-type="linenumber">14</context>
         </context-group>
       </trans-unit>
       <trans-unit id="44bd08a7ec1e407356620967d65d8fe2d8639d0a">
-        <source>Instance muted</source>
-        <context-group name="null">
+        <source>Instance muted</source><target>Instance muted</target><context-group name="null">
           <context context-type="linenumber">15</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1a6443bb7ed01046dd83cf78806f795f1204ffa1">
-        <source>Instance muted by your instance</source>
-        <context-group name="null">
+        <source>Instance muted by your instance</source><target>Instance muted by your instance</target><context-group name="null">
           <context context-type="linenumber">16</context>
         </context-group>
       </trans-unit>
@@ -2157,14 +2153,12 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a
         </context-group>
       </trans-unit>
       <trans-unit id="b1ff109b26ae8f08650415454b9098c43eba2e2c">
-        <source>Muted accounts</source>
-        <context-group name="null">
+        <source>Muted accounts</source><target>Muted accounts</target><context-group name="null">
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bd0611346af048015e0a1275091ef68ce98832d2">
-        <source>Muted servers</source>
-        <context-group name="null">
+        <source>Muted servers</source><target>Muted servers</target><context-group name="null">
           <context context-type="linenumber">11</context>
         </context-group>
       </trans-unit>
@@ -2176,14 +2170,12 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a
         </context-group>
       </trans-unit>
       <trans-unit id="079e99cce11c87b142e80fdd14dae98a61012fc4">
-        <source>Muted at <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></source>
-        <context-group name="null">
+        <source>Muted at <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></source><target>Muted at <x id="START_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;p-sortIcon&gt;"/><x id="CLOSE_TAG_P-SORTICON" ctype="x-p-sortIcon" equiv-text="&lt;/p-sortIcon&gt;"/></target><context-group name="null">
           <context context-type="linenumber">13</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1f689fada9748a830117f5b429a88ef8629082a8">
-        <source>Unmute</source>
-        <context-group name="null">
+        <source>Unmute</source><target>Unmute</target><context-group name="null">
           <context context-type="linenumber">23</context>
         </context-group>
       </trans-unit>
@@ -2237,8 +2229,7 @@ Det verkar som du inte är på en HTTPS-server. Din webbserver behöver ha TLS a
         </context-group>
       </trans-unit>
       <trans-unit id="2bc7533f8c8e7d183950ba1094a0acd9efc22e5e">
-        <source>Muted instances</source>
-        <context-group name="null">
+        <source>Muted instances</source><target>Muted instances</target><context-group name="null">
           <context context-type="linenumber">2</context>
         </context-group>
       </trans-unit>
@@ -3725,14 +3716,12 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt
         </context-group>
       </trans-unit>
       <trans-unit id="53cc0f4a4566c4139c65f93b5dce2fe8302e78da">
-        <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by your instance.</source>
-        <context-group name="null">
+        <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by your instance.</source><target>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by your instance.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="468b52e3c04fb9a3d8c8213555dfcad0cbcae330">
-        <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted by your instance.</source>
-        <context-group name="null">
+        <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted by your instance.</source><target>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted by your instance.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -3870,14 +3859,12 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt
         </context-group>
       </trans-unit>
       <trans-unit id="2667ca38672421a0a7a22343d2a0060ee41246de">
-        <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted.</source>
-        <context-group name="null">
+        <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted.</source><target>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="c6af80b42938d4a49e6f6c4f60ce26228916994c">
-        <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted.</source>
-        <context-group name="null">
+        <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted.</source><target>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
@@ -5410,86 +5397,72 @@ När du laddar upp en video i den här kanalen kommer supportfältet automatiskt
         </context-group>
       </trans-unit>
       <trans-unit id="33a6319f765848a22a155cef9f1d8e645202e249">
-        <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> muted.</source>
-        <context-group name="null">
+        <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> muted.</source><target>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> muted.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="086eda792aeb1b0d131d633b50fdd1792f5f24c6">
-        <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> muted.</source>
-        <context-group name="null">
+        <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> muted.</source><target>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> muted.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="bb72d6d1219e89d182e9fd09d853d83baf8d6499">
-        <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> muted by the instance.</source>
-        <context-group name="null">
+        <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> muted by the instance.</source><target>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> muted by the instance.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8686834bc4afe42c1991c6c18f0bce174a0e17a6">
-        <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by the instance.</source>
-        <context-group name="null">
+        <source>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by the instance.</source><target>Account <x id="INTERPOLATION" equiv-text="{{nameWithHost}}"/> unmuted by the instance.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="35d3509161861a610b0895bf084c781e56ba2830">
-        <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> muted by the instance.</source>
-        <context-group name="null">
+        <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> muted by the instance.</source><target>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> muted by the instance.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="978aeec5613fa97e8a5336d3599cebb23ee5a90f">
-        <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted by the instance.</source>
-        <context-group name="null">
+        <source>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted by the instance.</source><target>Instance <x id="INTERPOLATION" equiv-text="{{host}}"/> unmuted by the instance.</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4a09bf8724e7659fbb5ec33647529cdef7614bdc">
-        <source>Mute this account</source>
-        <context-group name="null">
+        <source>Mute this account</source><target>Mute this account</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="d666ca3261aef72b2ddcd649d7b32af488f59952">
-        <source>Unmute this account</source>
-        <context-group name="null">
+        <source>Unmute this account</source><target>Unmute this account</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="e17218983b1de76e5a920b04e1c2ecbdb6e3e06d">
-        <source>Mute the instance</source>
-        <context-group name="null">
+        <source>Mute the instance</source><target>Mute the instance</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="a23514d8aca2f8633622dda0e86b399dc576a2b9">
-        <source>Unmute the instance</source>
-        <context-group name="null">
+        <source>Unmute the instance</source><target>Unmute the instance</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4e4107055b44eee44b6954c41120de1cb4d46432">
-        <source>Mute this account by your instance</source>
-        <context-group name="null">
+        <source>Mute this account by your instance</source><target>Mute this account by your instance</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="a51c59cb5ecb7004a6a8ddd2855b5c52266ad957">
-        <source>Unmute this account by your instance</source>
-        <context-group name="null">
+        <source>Unmute this account by your instance</source><target>Unmute this account by your instance</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="588073e831cec240d6bb0db0b133e45dab69f178">
-        <source>Mute the instance by your instance</source>
-        <context-group name="null">
+        <source>Mute the instance by your instance</source><target>Mute the instance by your instance</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
       <trans-unit id="676221cdabd4805901343976988c028dbf71b20a">
-        <source>Unmute the instance by your instance</source>
-        <context-group name="null">
+        <source>Unmute the instance by your instance</source><target>Unmute the instance by your instance</target><context-group name="null">
           <context context-type="linenumber">1</context>
         </context-group>
       </trans-unit>
diff --git a/scripts/i18n/pull-hook.sh b/scripts/i18n/pull-hook.sh
index 3a8394110..b0668436d 100755
--- a/scripts/i18n/pull-hook.sh
+++ b/scripts/i18n/pull-hook.sh
@@ -7,6 +7,7 @@ set -eu
 
 for i in 1 2 3; do
     perl -pi -e 's|&lt;x id=(.+?)/&gt;([^"])|<x id=\1/>\2|g' client/src/locale/target/*.xml
+    perl -0pi -e 's|<source>(.+?)</source>\s*<context-group |<source>\1</source><target>\1</target><context-group |g' client/src/locale/target/angular_*.xml
 done
 
 npm run i18n:xliff2json