#6441 Update texts

plugins/CoreUpdater/lang/en.json

@@ -47,11 +47,10 @@
         "UpdateAutomatically": "Update Automatically",
         "UpdateHasBeenCancelledExplanation": "Piwik One Click Update has been cancelled. If you can't fix the above error message, it is recommended that you manually update Piwik. %1$s Please check out the %2$sUpdate documentation%3$s to get started!",
         "UpdateTitle": "Update",
-        "UpdateUsingHttpsFailed": "The download of the latest version over HTTPS failed:",
-        "UpdateUsingHttpsFailedHelp": "Updating using HTTPS can fail because of a network error or a wrong system configuration, but it can also be a sign that someone is trying to make you download an altered version of Piwik.",
-        "UpdateUsingHttpsFailedHelpWhatToDo": "Proceed to update using HTTP only if you are sure of what you are doing.",
-        "UpdateUsingHttpMessage": "You can update using the non-secure HTTP method:",
-        "UpdateRetryUsingHttp": "Retry updating using HTTP",
+        "UpdateUsingHttpsFailed": "Downloading the latest Piwik version over secure HTTPS connection did not succeed, because of the following error:",
+        "UpdateUsingHttpsFailedHelp": "Please note that downloading the latest Piwik version (over secure HTTPS connection) can fail for various reasons, for example in case of network error, slow network speed, or wrong system configuration.",
+        "UpdateUsingHttpsFailedHelpWhatToDo": "You may continue the update via the non-secure standard HTTP connection by clicking on the button '%s'.",
+        "UpdateUsingHttpMessage": "Update Piwik automatically (over the non secure HTTP connection)",
         "UpgradeComplete": "Upgrade complete!",
         "UpgradePiwik": "Upgrade Piwik",
         "VerifyingUnpackedFiles": "Verifying the unpacked files",

plugins/CoreUpdater/templates/oneClickResults.twig

@@ -9,21 +9,20 @@
 {% if httpsFail %}
     <br/>
     <br/>
-    <div class="error">
-        <img src="plugins/Morpheus/images/error_medium.png"/>
+    <div class="warning">
+        <img src="plugins/Morpheus/images/warning_medium.png"/>
         {{ 'CoreUpdater_UpdateUsingHttpsFailed'|translate }}<br/>
-        {{ error }}
+        "{{ error }}"
     </div>
     <p>{{ 'CoreUpdater_UpdateUsingHttpsFailedHelp'|translate }}</p>
-    <p>{{ 'CoreUpdater_UpdateUsingHttpsFailedHelpWhatToDo'|translate }}</p>
+    <p>{{ 'CoreUpdater_UpdateUsingHttpsFailedHelpWhatToDo'|translate('CoreUpdater_UpdateAutomatically'|translate) }}</p>
     <div class="warning">
-        <img src="plugins/Morpheus/images/warning_medium.png"/>
         {{ 'CoreUpdater_UpdateUsingHttpMessage'|translate }}
         <form id="oneclickupdate" action="index.php">
             <input type="hidden" name="module" value="CoreUpdater"/>
             <input type="hidden" name="action" value="oneClickUpdate"/>
             <input type="hidden" name="https" value="0"/>
-            <input id="updateUsingHttp" type="submit" class="submit" value="{{ 'CoreUpdater_UpdateRetryUsingHttp'|translate }}"/>
+            <input id="updateUsingHttp" type="submit" class="submit" value="{{ 'CoreUpdater_UpdateAutomatically'|translate }}"/>
         </form>
     </div>
     <br/>

expected-ui-screenshots @ 8fe69f4a

-Subproject commit a5234a335229b74acb3132a0e9de10cd3abcc377
+Subproject commit 8fe69f4a0708df35348bf701be916ad87d3761e8