Skip to content

Commit

Permalink
Merge pull request PrestaShop#36972 from PrestaShop/update-catalog-82x
Browse files Browse the repository at this point in the history 
Update default catalog 8.2.x
  • Loading branch information
@nicosomb
nicosomb authored Sep 20, 2024
2 parents 2c831dc + d91fc99 commit 346f82e
Show file tree
Hide file tree
Showing 52 changed files with 4,750 additions and 5,082 deletions.
645 changes: 317 additions & 328 deletions translations/default/AdminActions.xlf
View file

Large diffs are not rendered by default.

1,514 changes: 744 additions & 770 deletions translations/default/AdminAdvparametersFeature.xlf
View file

Large diffs are not rendered by default.

125 changes: 57 additions & 68 deletions translations/default/AdminAdvparametersHelp.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,36 @@
<note>Line: 1074
Comment: Special case for Product : either one or the other. Not both.</note>
</trans-unit>
<trans-unit id="4bc14a0f722453ba235bc3fb52d95ffb">
<source>A category root is where a category tree can begin. This is used with multistore.</source>
<target>A category root is where a category tree can begin. This is used with multistore.</target>
<note>Line: 212</note>
</trans-unit>
<trans-unit id="2d743ae4c74db2a22d79e1e950e719e5">
<source>0 = Use quantity set in product, 1 = Use quantity from warehouse.</source>
<target>0 = Use quantity set in product, 1 = Use quantity from warehouse.</target>
<note>Line: 335</note>
</trans-unit>
<trans-unit id="aaf88088b0ac3f2992888fdfe00b5d76">
<source>ID of the warehouse to set as storage.</source>
<target>ID of the warehouse to set as storage.</target>
<note>Line: 339</note>
</trans-unit>
<trans-unit id="3fc09360fdbfd34338847f0c4d2c706a">
<source>Enable advanced stock management on product (0 = No, 1 = Yes)</source>
<target>Enable advanced stock management on product (0 = No, 1 = Yes)</target>
<note>Line: 169</note>
</trans-unit>
<trans-unit id="5ed37ab0d176038cd3289e1fe4fb5637">
<source>Enable advanced stock management on product (0 = No, 1 = Yes).</source>
<target>Enable advanced stock management on product (0 = No, 1 = Yes).</target>
<note>Line: 331</note>
</trans-unit>
<trans-unit id="d2beb087630a099f2fada85e7f2f19fb">
<source>Ignore this field if you don't use the Multistore tool. If you leave this field empty, the default store will be used.</source>
<target>Ignore this field if you don't use the Multistore tool. If you leave this field empty, the default store will be used.</target>
<note>Line: 543</note>
</trans-unit>
</body>
</file>
<file original="controllers/admin/AdminShopController.php" source-language="en-US" target-language="en" datatype="plaintext">
Expand Down Expand Up @@ -193,11 +223,6 @@ Comment: Special case for Product : either one or the other. Not both.</note>
</file>
<file original="src/Core/Import/EntityField/Provider/CategoryFieldsProvider.php" source-language="en-US" target-language="en" datatype="plaintext">
<body>
<trans-unit id="4bc14a0f722453ba235bc3fb52d95ffb">
<source>A category root is where a category tree can begin. This is used with multistore.</source>
<target>A category root is where a category tree can begin. This is used with multistore.</target>
<note>Line: 64</note>
</trans-unit>
<trans-unit id="11cd708df7411da4546d8580356e711a">
<source>Ignore this field if you don't use the Multistore tool. If you leave this field empty, the default shop will be used.</source>
<target>Ignore this field if you don't use the Multistore tool. If you leave this field empty, the default shop will be used.</target>
Expand All @@ -207,21 +232,6 @@ Comment: Special case for Product : either one or the other. Not both.</note>
</file>
<file original="src/Core/Import/EntityField/Provider/CombinationFieldsProvider.php" source-language="en-US" target-language="en" datatype="plaintext">
<body>
<trans-unit id="2d743ae4c74db2a22d79e1e950e719e5">
<source>0 = Use quantity set in product, 1 = Use quantity from warehouse.</source>
<target>0 = Use quantity set in product, 1 = Use quantity from warehouse.</target>
<note>Line: 95</note>
</trans-unit>
<trans-unit id="aaf88088b0ac3f2992888fdfe00b5d76">
<source>ID of the warehouse to set as storage.</source>
<target>ID of the warehouse to set as storage.</target>
<note>Line: 100</note>
</trans-unit>
<trans-unit id="3fc09360fdbfd34338847f0c4d2c706a">
<source>Enable advanced stock management on product (0 = No, 1 = Yes)</source>
<target>Enable advanced stock management on product (0 = No, 1 = Yes)</target>
<note>Line: 90</note>
</trans-unit>
<trans-unit id="5702db29cfdd93934ed330edb201ecf3">
<source>Enable Advanced Stock Management on product (0 = No, 1 = Yes)</source>
<target>Enable Advanced Stock Management on product (0 = No, 1 = Yes)</target>
Expand All @@ -231,27 +241,13 @@ Comment: Special case for Product : either one or the other. Not both.</note>
</file>
<file original="src/Core/Import/EntityField/Provider/ProductFieldsProvider.php" source-language="en-US" target-language="en" datatype="plaintext">
<body>
<trans-unit id="5ed37ab0d176038cd3289e1fe4fb5637">
<source>Enable advanced stock management on product (0 = No, 1 = Yes).</source>
<target>Enable advanced stock management on product (0 = No, 1 = Yes).</target>
<note>Line: 155</note>
</trans-unit>
<trans-unit id="7506b41cf1aa65b2663b038e465c0d6d">
<source>Enable Advanced Stock Management on product (0 = No, 1 = Yes).</source>
<target>Enable Advanced Stock Management on product (0 = No, 1 = Yes).</target>
<note>Line: 155</note>
</trans-unit>
</body>
</file>
<file original="src/Core/Import/EntityField/Provider/StoreContactFieldsProvider.php" source-language="en-US" target-language="en" datatype="plaintext">
<body>
<trans-unit id="d2beb087630a099f2fada85e7f2f19fb">
<source>Ignore this field if you don't use the Multistore tool. If you leave this field empty, the default store will be used.</source>
<target>Ignore this field if you don't use the Multistore tool. If you leave this field empty, the default store will be used.</target>
<note>Line: 77</note>
</trans-unit>
</body>
</file>
<file original="src/PrestaShopBundle/Form/Admin/AdvancedParameters/Performance/CombineCompressCacheType.php" source-language="en-US" target-language="en" datatype="plaintext">
<body>
<trans-unit id="021007c7da195ab112330b846e0b1cbb">
Expand Down Expand Up @@ -468,6 +464,11 @@ Comment: Special case for Product : either one or the other. Not both.</note>
<target>This page will be displayed just after login.</target>
<note>Line: 229</note>
</trans-unit>
<trans-unit id="d222c4d0463bd3f146536ac89c0d7c77">
<source>Password should be at least %num% characters long.</source>
<target>Password should be at least %num% characters long.</target>
<note>Line: 173</note>
</trans-unit>
</body>
</file>
<file original="src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Import/ImportType.php" source-language="en-US" target-language="en" datatype="plaintext">
Expand Down Expand Up @@ -564,39 +565,6 @@ Comment: Special case for Product : either one or the other. Not both.</note>
</trans-unit>
</body>
</file>
<file original="src/PrestaShopBundle/Form/Admin/Type/ChangePasswordType.php" source-language="en-US" target-language="en" datatype="plaintext">
<body>
<trans-unit id="d222c4d0463bd3f146536ac89c0d7c77">
<source>Password should be at least %num% characters long.</source>
<target>Password should be at least %num% characters long.</target>
<note>Line: 90</note>
</trans-unit>
</body>
</file>
<file original="src/PrestaShopBundle/Resources/views/Admin/Common/Grid/Columns/Content/severity_level.html.twig" source-language="en-US" target-language="en" datatype="plaintext">
<body>
<trans-unit id="b80c52e7f679fba3c2837b42705fe779">
<source>Informative only</source>
<target>Informative only</target>
<note>Line: 31</note>
</trans-unit>
<trans-unit id="0eaadb4fcb48a0a0ed7bc9868be9fbaa">
<source>Warning</source>
<target>Warning</target>
<note>Line: 34</note>
</trans-unit>
<trans-unit id="902b0d55fddef6f8d651fe1035b7d4bd">
<source>Error</source>
<target>Error</target>
<note>Line: 37</note>
</trans-unit>
<trans-unit id="4a378407770df6a42474ec5db9f54740">
<source>Major issue (crash)!</source>
<target>Major issue (crash)!</target>
<note>Line: 40</note>
</trans-unit>
</body>
</file>
<file original="src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/Backup/Blocks/backup_info.html.twig" source-language="en-US" target-language="en" datatype="plaintext">
<body>
<trans-unit id="20fbc8f64351875f498d7d6f8c91810b">
Expand Down Expand Up @@ -739,6 +707,26 @@ Comment: Special case for Product : either one or the other. Not both.</note>
</file>
<file original="src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/LogsPage/Blocks/severity_levels.html.twig" source-language="en-US" target-language="en" datatype="plaintext">
<body>
<trans-unit id="b80c52e7f679fba3c2837b42705fe779">
<source>Informative only</source>
<target>Informative only</target>
<note>Line: 36</note>
</trans-unit>
<trans-unit id="0eaadb4fcb48a0a0ed7bc9868be9fbaa">
<source>Warning</source>
<target>Warning</target>
<note>Line: 41</note>
</trans-unit>
<trans-unit id="902b0d55fddef6f8d651fe1035b7d4bd">
<source>Error</source>
<target>Error</target>
<note>Line: 46</note>
</trans-unit>
<trans-unit id="4a378407770df6a42474ec5db9f54740">
<source>Major issue (crash)!</source>
<target>Major issue (crash)!</target>
<note>Line: 51</note>
</trans-unit>
<trans-unit id="3979bb684920e9e9dc86e266f93d8c87">
<source>Severity levels</source>
<target>Severity levels</target>
Expand Down Expand Up @@ -771,7 +759,8 @@ Comment: Special case for Product : either one or the other. Not both.</note>
<trans-unit id="09fac4ee316f450e3defd79540c2d9fe">
<source>You can also export the query results as a CSV file by clicking on the "%export_label%" button</source>
<target>You can also export the query results as a CSV file by clicking on the "%export_label%" button</target>
<note>Line: 37</note>
<note>Line: 37
Comment: Recommended modules will be attached to here.</note>
</trans-unit>
</body>
</file>
Expand Down
Loading

0 comments on commit 346f82e

Please sign in to comment.