Merge pull request #1023 from PrestaShop/translation-extraction

Translation catalog update
PrestaShop · Nov 18, 2024 · 0edf575 · 0edf575
2 parents 81c19e4 + 3365078
commit 0edf575
Showing 1 changed file with 50 additions and 21 deletions.
diff --git a/translations/ModulesAutoupgradeAdmin.en.xlf b/translations/ModulesAutoupgradeAdmin.en.xlf
@@ -20,7 +20,7 @@
       <trans-unit id="8f6819dd1d8ef2e214833f667fe994b0">
         <source>Value must be a boolean for %s</source>
         <target>Value must be a boolean for %s</target>
-        <note>Line: 112</note>
+        <note>Line: 115</note>
       </trans-unit>
     </body>
   </file>
@@ -773,11 +773,6 @@ Comment: directory already exists</note>
         <target>Keeping them enabled might prevent you from loading the "Modules" page properly after the upgrade.</target>
         <note>Line: 63</note>
       </trans-unit>
-      <trans-unit id="03a9e6840847f96325b7184d5f3c2769">
-        <source>Disable all overrides</source>
-        <target>Disable all overrides</target>
-        <note>Line: 66</note>
-      </trans-unit>
       <trans-unit id="29826f9f4da3d473c1e4ecf2f6c4ef9f">
         <source>Enable or disable all classes and controllers overrides.</source>
         <target>Enable or disable all classes and controllers overrides.</target>
@@ -793,19 +788,19 @@ Comment: directory already exists</note>
         <target>This will change your theme: your shop will then use the default theme of the version of PrestaShop you are upgrading to.</target>
         <note>Line: 79</note>
       </trans-unit>
-      <trans-unit id="f22d57f1f0b7fd2a55ca4760cd6ef68b">
-        <source>Keep the customized email templates</source>
-        <target>Keep the customized email templates</target>
+      <trans-unit id="a860c5003a8ba7179392ca8ecf6f2c47">
+        <source>Regenerate the customized email templates</source>
+        <target>Regenerate the customized email templates</target>
         <note>Line: 83</note>
       </trans-unit>
       <trans-unit id="5ea970658668e0b45cb6f64ce18b420e">
         <source>This will not upgrade the default PrestaShop e-mails.</source>
         <target>This will not upgrade the default PrestaShop e-mails.</target>
         <note>Line: 87</note>
       </trans-unit>
-      <trans-unit id="a83c73a145dbc0f4ea7c6a95203df43d">
-        <source>If you customized the default PrestaShop e-mail templates, enabling this option will keep your modifications.</source>
-        <target>If you customized the default PrestaShop e-mail templates, enabling this option will keep your modifications.</target>
+      <trans-unit id="71ac7fb560160b527c1cd7978e9f0326">
+        <source>If you customized the default PrestaShop e-mail templates, switching off this option will keep your modifications.</source>
+        <target>If you customized the default PrestaShop e-mail templates, switching off this option will keep your modifications.</target>
         <note>Line: 88</note>
       </trans-unit>
       <trans-unit id="564b7c9d8683f1a94798e9f7449564e4">
@@ -1153,15 +1148,15 @@ Comment: directory already exists</note>
         <target>Cleaning XML files</target>
         <note>Line: 135</note>
       </trans-unit>
-      <trans-unit id="ed176ad3db6e004d4c272928acf3d0ac">
-        <source>Disabling overrides</source>
-        <target>Disabling overrides</target>
-        <note>Line: 139</note>
-      </trans-unit>
       <trans-unit id="12473a5949de1a1cd37806a14a56dbde">
         <source>Keeping overrides in place</source>
         <target>Keeping overrides in place</target>
-        <note>Line: 142</note>
+        <note>Line: 139</note>
+      </trans-unit>
+      <trans-unit id="ed176ad3db6e004d4c272928acf3d0ac">
+        <source>Disabling overrides</source>
+        <target>Disabling overrides</target>
+        <note>Line: 141</note>
       </trans-unit>
       <trans-unit id="9c7e0ba2c6ecb11af7f39843bbc18ff8">
         <source>Warning detected during upgrade.</source>
@@ -1504,17 +1499,17 @@ Comment: directory already exists</note>
       <trans-unit id="001c32426a6cfb48ebb848b13141593c">
         <source>Major version</source>
         <target>Major version</target>
-        <note>Line: 94</note>
+        <note>Line: 95</note>
       </trans-unit>
       <trans-unit id="c5439de366a407641018f189da1ad4a7">
         <source>Minor version</source>
         <target>Minor version</target>
-        <note>Line: 97</note>
+        <note>Line: 98</note>
       </trans-unit>
       <trans-unit id="8a0dd44f366bc5604b8329a87be5f933">
         <source>Patch version</source>
         <target>Patch version</target>
-        <note>Line: 100</note>
+        <note>Line: 101</note>
       </trans-unit>
     </body>
   </file>
@@ -2354,6 +2349,40 @@ Comment: directory already exists</note>
       </trans-unit>
     </body>
   </file>
+  <file original="views/templates/steps/update-options.html.twig" source-language="en-US" target-language="en-US" datatype="plaintext">
+    <body>
+      <trans-unit id="03a9e6840847f96325b7184d5f3c2769">
+        <source>Disable all overrides</source>
+        <target>Disable all overrides</target>
+        <note>Line: 40</note>
+      </trans-unit>
+      <trans-unit id="754e7de2554f7664a9ccacff4791b8cc">
+        <source>Deactivate non-native modules</source>
+        <target>Deactivate non-native modules</target>
+        <note>Line: 21</note>
+      </trans-unit>
+      <trans-unit id="4781d45087dad35199137e7e06490c76">
+        <source>incompatible with the new version of PrestaShop. We recommend deactivating them during the update.</source>
+        <target>incompatible with the new version of PrestaShop. We recommend deactivating them during the update.</target>
+        <note>Line: 23</note>
+      </trans-unit>
+      <trans-unit id="81b6978502363841a3bf10daba2245a0">
+        <source>Regenerate email templates</source>
+        <target>Regenerate email templates</target>
+        <note>Line: 31</note>
+      </trans-unit>
+      <trans-unit id="fa7822529883d315d967479ca1b03086">
+        <source>If you've customized email templates, your changes will be lost if you activate this option.</source>
+        <target>If you've customized email templates, your changes will be lost if you activate this option.</target>
+        <note>Line: 32</note>
+      </trans-unit>
+      <trans-unit id="26673bf4fe8a2b465e4e4f8afb9bb590">
+        <source>you to avoid conflicts during and after updates.</source>
+        <target>you to avoid conflicts during and after updates.</target>
+        <note>Line: 43</note>
+      </trans-unit>
+    </body>
+  </file>
   <file original="views/templates/steps/version-choice.html.twig" source-language="en-US" target-language="en-US" datatype="plaintext">
     <body>
       <trans-unit id="10ac3d04253ef7e1ddc73e6091c0cd55">