Fix a few wordings in mail

.t9n.yml

@@ -20,3 +20,4 @@ exclude_files:
   - tools
   - mails/[a-zA-Z]{2}/
   - js
+  - modules/ps_themecusto

mails/themes/classic/core/account.html.twig

@@ -22,12 +22,12 @@
             {% if templateType == 'html' %}
 
               <p style="border-bottom:1px solid #D6D4D4;">
-                {{ 'Your {shop_name} login details'|trans({}, 'Emails.Body', locale) }}
+                {{ 'Your login email address on {shop_name}'|trans({}, 'Emails.Body', locale)|raw }}
               </p>
 
 {% endif %}
             <span>
-              {{ 'Here are your login details:'|trans({}, 'Emails.Body', locale)|raw }}<br/>
+              {{ 'Here is your login email address:'|trans({}, 'Emails.Body', locale)|raw }}<br/>
               <span><strong>{{ 'E-mail address:'|trans({}, 'Emails.Body', locale)|raw }} <a href="mailto:{email}">{email}</a></strong></span>
             </span>
           </font>

mails/themes/classic/core/log_alert.html.twig

@@ -27,7 +27,7 @@
 {% endif %}
             <span>
               {{ '<span><strong>Warning:</strong></span> you have received a new log alert in your Back Office.'|trans({}, 'Emails.Body', locale)|raw }}<br/><br/>
-              {{ 'You can check for it in the <span><strong>"Tools" &gt; "Logs"</strong></span> section of your Back Office.'|trans({}, 'Emails.Body', locale)|raw }}
+              {{ 'You can check for it in the <span><strong>Advanced Parameters &gt; Logs</strong></span> section of your Back Office.'|trans({}, 'Emails.Body', locale)|raw }}
             </span>
           </font>
         </td>

mails/themes/classic/core/productoutofstock.html.twig

@@ -28,7 +28,7 @@
             <span>
               {{ 'The remaining stock is now less than the specified minimum of'|trans({}, 'Emails.Body', locale)|raw }} <strong><span>{last_qty}.</span></strong><br/><br/>
               <strong><span>{{ 'Remaining stock:'|trans({}, 'Emails.Body', locale)|raw }}</span></strong> {qty}<br/><br/>
-              {{ 'You are advised to open the product\'s admin Product Page in order to replenish your inventory.'|trans({}, 'Emails.Body', locale)|raw }}
+              {{ 'Replenish your inventory, go to the <span><strong>Catalog &gt; Stocks</span></strong> section of your back office to manage your stock.'|trans({}, 'Emails.Body', locale)|raw }}
             </span>
           </font>
         </td>

mails/themes/classic/modules/ps_emailalerts/productoutofstock.html.twig

@@ -28,7 +28,7 @@
             <span>
               {{ 'The remaining stock is now less than the specified minimum of'|trans({}, 'Emails.Body', locale)|raw }} <strong><span>{last_qty}.</span></strong><br/><br/>
               <strong><span>{{ 'Remaining stock:'|trans({}, 'Emails.Body', locale)|raw }}</span></strong> {qty}<br/><br/>
-              {{ 'You are advised to open the product\'s admin Product Page in order to replenish your inventory.'|trans({}, 'Emails.Body', locale)|raw }}
+              {{ 'Replenish your inventory, go to the <span><strong>Catalog &gt; Stocks</span></strong> section of your back office to manage your stock.'|trans({}, 'Emails.Body', locale)|raw }}
             </span>
           </font>
         </td>

mails/themes/modern/core/order_canceled.html.twig

@@ -247,6 +247,13 @@
                                         </div>
                                       </td>
                                     </tr>
+                                    <tr>
+                                      <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
+                                        <div style="font-family:Open sans, arial, sans-serif;font-size:14px;line-height:25px;text-align:left;color:#363A41;">
+                                          {{ 'Go to your customer account to learn more about it.'|trans({}, 'Emails.Body', locale)|raw }}
+                                        </div>
+                                      </td>
+                                    </tr>
                                   </table>
                                 </td>
                               </tr>
@@ -281,65 +288,6 @@
                  class="" width="604px"
               >
           
-      <table
-         align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:604px;" width="604"
-      >
-        <tr>
-          <td style="line-height:0px;font-size:0px;mso-line-height-rule:exactly;">
-      <![endif]-->
-              <div style="Margin:0px auto;max-width:604px;">
-                <table align="center" border="0" cellpadding="0" cellspacing="0" role="presentation" style="width:100%;">
-                  <tbody>
-                    <tr>
-                      <td style="direction:ltr;font-size:0px;padding:0 25px 20px;text-align:center;vertical-align:top;">
-                        <!--[if mso | IE]>
-                  <table role="presentation" border="0" cellpadding="0" cellspacing="0">
-                
-        <tr>
-      
-            <td
-               class="" style="vertical-align:top;width:554px;"
-            >
-          <![endif]-->
-                        <div class="mj-column-per-100 outlook-group-fix" style="font-size:13px;text-align:left;direction:ltr;display:inline-block;vertical-align:top;width:100%;">
-                          <table border="0" cellpadding="0" cellspacing="0" role="presentation" style="vertical-align:top;" width="100%">
-                            <tr>
-                              <td align="left" style="font-size:0px;padding:10px 25px;word-break:break-word;">
-                                <div style="font-family:Open sans, arial, sans-serif;font-size:14px;line-height:25px;text-align:left;color:#363A41;">
-                                  {{ 'Go to your customer account to learn more about it.'|trans({}, 'Emails.Body', locale)|raw }}
-                                </div>
-                              </td>
-                            </tr>
-                          </table>
-                        </div>
-                        <!--[if mso | IE]>
-            </td>
-          
-        </tr>
-      
-                  </table>
-                <![endif]-->
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-              <!--[if mso | IE]>
-          </td>
-        </tr>
-      </table>
-      
-              </td>
-            </tr>
-          <![endif]-->
-              <!-- FIRST TEXT ENDING -->
-              <!-- SECOND TEXT BEGINING -->
-              <!--[if mso | IE]>
-            <tr>
-              <td
-                 class="" width="604px"
-              >
-          
       <table
          align="center" border="0" cellpadding="0" cellspacing="0" class="" style="width:604px;" width="604"
       >
@@ -391,7 +339,7 @@
               </td>
             </tr>
           <![endif]-->
-              <!-- SECOND TEXT ENDING -->
+              <!-- FIRST TEXT ENDING -->
               <!--[if mso | IE]>
                   </table>
                 <![endif]-->

src/PrestaShopBundle/Controller/Admin/Improve/International/LanguageController.php

@@ -330,7 +330,7 @@ private function getErrorMessages(Exception $e)
             ],
             LanguageImageUploadingException::class => [
                 LanguageImageUploadingException::MEMORY_LIMIT_RESTRICTION => $this->trans(
-                    'Due to memory limit restrictions, this image cannot be loaded. Please increase your memory_limit value via your server\'s configuration settings. ',
+                    'Due to memory limit restrictions, this image cannot be loaded. Please increase your memory_limit value via your server\'s configuration settings.',
                     'Admin.Notifications.Error'
                 ),
                 LanguageImageUploadingException::UNEXPECTED_ERROR => $this->trans(