move electron to v1.1.22

offline template
2019-10-07 14:23:34 -07:00 · 2019-10-07 14:22:05 -07:00
431 changed files with 278 additions and 158 deletions
--- a/.github/workflows/calibreapp-image-actions.yml
+++ b/.github/workflows/calibreapp-image-actions.yml
@ -1,12 +0,0 @@
 name: Compress images
 on: pull_request
 jobs:
  build:
    name: calibreapp/image-actions
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@master
      - name: calibreapp/image-actions
        uses: docker://calibreapp/github-image-actions
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/docfiles/footer.html
+++ b/docfiles/footer.html
@ -6,13 +6,13 @@
            <a class="item" href="https://makecode.com/privacy" target="_blank" rel="noopener">Privacy &amp; Cookies</a>
            <a class="item" href="https://makecode.com/termsofuse" target="_blank" rel="noopener"> Terms Of Use</a>
            <a class="item" href="https://makecode.com/trademarks" target="_blank" rel="noopener">Trademarks</a>
-            <div class="item">© 2018 Microsoft</div>
+            <div class="item">©2019 Microsoft</div>
        </div>
        <div class="ui container horizontal small divided link list">
            <a class="ui centered item" href="https://makecode.com/" title="Microsoft MakeCode" target="_blank" rel="noopener">Powered by Microsoft MakeCode</a>
        </div>
        <div class="ui centered container small list">
-            <p class="item">LEGO, the LEGO logo, MINDSTORMS and the MINDSTORMS EV3 logo are trademarks and/ or copyrights of the LEGO Group. ©2018 The LEGO Group. All rights reserved.</p>
+            <p class="item">@copyrightText@</p>
        </div>
    </div>
 </footer>
--- a/docs/getting-started/try.md
+++ b/docs/getting-started/try.md
@ -54,12 +54,6 @@ Verify that the program you just created shows eyes on the Brick Display, and th
 **Well done!**
 ## Run it Again
 ![EV# Brick with Try in BrkProg_Save Folder in File Manager](/static/getting-started/Try-in-file-manager.png)
 Use the Brick Buttons and navigate to the File Manager tab.  Open the **BrkProg_SAVE** folder, select **Try** and click the center button to run it again.
 ## Connect a Large Motor
 Now you will learn to control the Large Motor.
--- a/docs/offline-app.html
+++ b/docs/offline-app.html
@ -3,11 +3,20 @@
 <head>
    <meta charset="UTF-8">
-    <title>LEGO® MINDSTORMS® Education EV3 Offline App</title>
+    <title>@name@ Offline App</title>
-    <meta name="Description" content="A MakeCode for LEGO® MINDSTORMS® Education EV3 offline app" />
+    <meta name="Description" content="A MakeCode for @name@ offline app" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <!-- @include indexhead.html -->
+    <link rel="stylesheet" data-rtl="/blb/rtlsemantic.css" href="/doccdn/semantic.css" />
    <link rel="stylesheet" href="/docfiles/style.css" />
    <link rel="stylesheet" href="/docfiles/target.css" />
    <script src="/doccdn/jquery.js" type="text/javascript"></script>
    <script src="/doccdn/semantic.js" type="text/javascript"></script>
    <script src="/docfiles/target.js" type="text/javascript"></script>
    <style>
        @targetstyle@
    </style>
    <style>
        p.item {
            color: rgba(0, 0, 0, 0.4);
@ -55,6 +64,10 @@
            background-color: rgb(250, 250, 250);
        }
        #legal-segment {
            background:white;
        }
        @media only screen and (max-width: 800px) {
            .grid .column .image {
                display: none;
@ -368,8 +381,8 @@
    </style>
    <script>
-        $(document).ready(function () {
+        var electronLatestVersion = "";
-            tickEvent = function (id, data) {
+        function tickEvent(id, data) {
            if (!pxt.aiTrackEvent) return;
            if (!data) pxt.aiTrackEvent(id);
            else {
@ -381,21 +394,48 @@
                pxt.aiTrackEvent(id, props, measures);
            }
        }
-        });
+
        function agreeCheckboxChanged() {
-            var downloadSegment = document.getElementById("download-segment");
+            showDownloads();
-            downloadSegment.classList.toggle("hidden");
+        }
        function showAgree() {
            $("#agree-segment").removeClass("hidden");
            $("#read-segment").removeClass("hidden");
            $("#legal-segment").removeClass("hidden");
 }
        function showNoDownloads() {
            $("#no-download-segment").removeClass("hidden");
            $("#read-segment").addClass("hidden");
            $("#legal-segment").addClass("hidden");
        }
        function showDownloads() {
            $("#download-win64").attr("href", "https://makecode.com/api/release/@targetid@/" + electronLatestVersion + "/win64");
            $("#download-mac64").attr("href", "https://makecode.com/api/release/@targetid@/" + electronLatestVersion + "/mac64");
            $("#download-segment").removeClass("hidden");
        }
        function downloadWin64() {
-            // TODO: Keep this link up-to-date with the desired release version
+            tickEvent("offlineapp.download", { "target": "@targetid@", "platform": "win64" });
            window.open("https://makecode.com/api/release/ev3/v1.2.22/win64");
            tickEvent("offlineapp.download", { "target": "ev3", "platform": "win64" });
        }
        function downloadMac64() {
-            // TODO: Keep this link up-to-date with the desired release version
+            tickEvent("offlineapp.download", { "target": "@targetid@", "platform": "mac64" });
            window.open("https://makecode.com/api/release/ev3/v1.2.22/mac64");
            tickEvent("offlineapp.download", { "target": "ev3", "platform": "mac64" });
        }
        $(function () {
            $.getJSON("https://makecode.com/api/config/@targetid@/targetconfig")
                .then(function (data) {
                    if (data && data.electronManifest && data.electronManifest.latest) {
                        electronLatestVersion = data.electronManifest.latest;
                        showAgree();
                    } else {
                        showNoDownloads();
                    }
                })
                .catch(function () {
                    showNoDownloads();
                })
        });
    </script>
 </head>
@ -406,35 +446,39 @@
        <div class="ui grid topbar">
            <div class="three wide column">
-                <img class="ui small image left" src="/static//lego_education_logo_white.png" />
+                <img class="ui small image left" src="@cardLogo@" />
            </div>
            <div class="ten wide column">
-                <h1 class="ui inverted welcomeheader">MakeCode Offline App</h1>
+                <h1 class="ui inverted welcomeheader">@name@ Offline App</h1>
            </div>
            <div class="three wide column">
-                <img class="ui small image right" src="/static//Microsoft-logo_rgb_c-white.png" />
+                <img class="ui small image right" src="/static/Microsoft-logo_rgb_c-white.png" />
            </div>
        </div>
-        <div class="ui compact segments terms-container">
+        <div id="segments" class="ui compact segments terms-container">
-            <div class="ui secondary center aligned segment">
+            <div id="read-segment" class="ui secondary center aligned segment hidden">
                Please read and accept the following terms to download the app.
            </div>
-            <div class="ui left aligned segment terms">
+            <div id="legal-segment" class="ui left aligned segment terms hidden">
                <div id="loader" class="ui active loader"></div>
                <div class="c17">
                    <p class="c11">
                        <span class="c4 c1">MICROSOFT PRE-RELEASE SOFTWARE LICENSE TERMS</span>
                    </p>
                    <p class="c11">
-                        <span class="c4 c1">MICROSOFT MAKECODE FOR LEGO MINDSTORMS EDUCATION EV3</span>
+                        <span class="c4 c1">MICROSOFT MAKECODE SOFTWARE FOR @name@</span>
                    </p>
                    <p class="c7">
                        <span class="c4 c1"></span>
                    </p>
                    <p class="c11">
-                        <span class="c3 c1">These license terms are an agreement between Microsoft Corporation (or based on where you live, one
+                        <span class="c3 c1">These license terms are an agreement between Microsoft Corporation (or based
-                            of its affiliates) and you. They apply to the software named above. The terms also apply to any
+                            on where you live, one
-                            Microsoft services or updates for the software, except to the extent those have additional terms.</span>
+                            of its affiliates) and you. They apply to the software named above. The terms also apply to
                            any
                            Microsoft services or updates for the software, except to the extent those have additional
                            terms.</span>
                    </p>
                    <p class="c7">
                        <span class="c3 c1"></span>
@ -446,26 +490,34 @@
                        <span class="c5 c1">1.</span>
                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        <span class="c5 c1">INSTALLATION AND USE RIGHTS. </span>
-                        <span class="c3 c1">You may install and use any number of copies of the software to evaluate it as you develop and test
+                        <span class="c3 c1">You may install and use any number of copies of the software to evaluate it
-                            your software applications for use with Lego Mindstorms Education EV3 hardware.</span>
+                            as you develop and test
                            your software applications for use with @name@ hardware.</span>
                    </p>
                    <p class="c2">
                        <span class="c5 c1">2.</span>
                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        <span class="c5 c1">PRE-RELEASE SOFTWARE. </span>
-                        <span class="c3 c1">The software is a pre-release version. It may not work the way a final version of the software will.
+                        <span class="c3 c1">The software is a pre-release version. It may not work the way a final
-                            Microsoft may change it for the final, commercial version. We also may not release a commercial
+                            version of the software will.
-                            version. Microsoft is not obligated to provide maintenance, technical support or updates to you
+                            Microsoft may change it for the final, commercial version. We also may not release a
                            commercial
                            version. Microsoft is not obligated to provide maintenance, technical support or updates to
                            you
                            for the software.</span>
                    </p>
                    <p class="c2">
                        <span class="c5 c1">3.</span>
                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        <span class="c5 c1">ASSOCIATED ONLINE SERVICES.</span>
-                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Some features of the software provide access 
+                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Some features of the software
-                            to, or rely on, online services to provide you information about updates to the software or extensions, 
+                            provide access
-                            or to enable you to retrieve content, collaborate with others, or otherwise supplement your development 
+                            to, or rely on, online services to provide you information about updates to the software or
-                            experience.  As used throughout these license terms, the term <q>software</q> includes these online 
+                            extensions,
                            or to enable you to retrieve content, collaborate with others, or otherwise supplement your
                            development
                            experience. As used throughout these license terms, the term <q>software</q> includes these
                            online
                            services and features. By using these online services and features you consent to the to the
                            transmission of information as described in Section 5, DATA.
                        </span>
@ -474,9 +526,11 @@
                        <span class="c5 c1">4.</span>
                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        <span class="c5 c1">LICENSES FOR OTHER COMPONENTS.</span>
-                        <span class="c3 c1">&nbsp;The software may include third party components with separate legal notices or governed by
+                        <span class="c3 c1">&nbsp;The software may include third party components with separate legal
                            notices or governed by
                            other agreements, as described in the ThirdPartyNotices file accompanying the software. Even
-                            if such components are governed by other agreements, the disclaimers and the limitations on and
+                            if such components are governed by other agreements, the disclaimers and the limitations on
                            and
                            exclusions of damages below also apply.</span>
                    </p>
                    <p class="c2">
@ -488,26 +542,35 @@
                        <span class="c5 c1">a.</span>
                        <span class="c1">&nbsp; &nbsp;</span>
                        <span class="c1 c5">Data Collection. </span>
-                        <span class="c1">The software may collect information about you and your use of the software, and send that to Microsoft.
+                        <span class="c1">The software may collect information about you and your use of the software,
-                            Microsoft may use this information to provide services and improve our products and services.
+                            and send that to Microsoft.
-                            You may opt out of many of these scenarios, but not all, as described in the product documentation.
+                            Microsoft may use this information to provide services and improve our products and
-                            In using the software, you must comply with applicable law. You can learn more about data collection
+                            services.
                            You may opt out of many of these scenarios, but not all, as described in the product
                            documentation.
                            In using the software, you must comply with applicable law. You can learn more about data
                            collection
                            and use in the help documentation and the privacy statement at </span>
                        <span class="c14 c1">
-                            <a class="c9" href="http://go.microsoft.com/fwlink/?LinkId=398505">http://go.microsoft.com/fwlink/?LinkId=398505</a>
+                            <a class="c9"
                                href="http://go.microsoft.com/fwlink/?LinkId=398505">http://go.microsoft.com/fwlink/?LinkId=398505</a>
                        </span>
                        <span class="c1">.</span>
-                        <span class="c3 c1">&nbsp;Your use of the software operates as your consent to these practices.</span>
+                        <span class="c3 c1">&nbsp;Your use of the software operates as your consent to these
                            practices.</span>
                    </p>
                    <p class="c8">
                        <span class="c5 c1">b.</span>
                        <span class="c1">&nbsp; &nbsp;</span>
                        <span class="c5 c1">Processing of Personal Data. </span>
-                        <span class="c1">To the extent Microsoft is a processor or subprocessor of personal data in connection with the software,
+                        <span class="c1">To the extent Microsoft is a processor or subprocessor of personal data in
-                            Microsoft makes the commitments in the European Union General Data Protection Regulation Terms
+                            connection with the software,
                            Microsoft makes the commitments in the European Union General Data Protection Regulation
                            Terms
                            of the Online Services Terms to all customers effective May 25, 2018, at </span>
                        <span class="c1 c14">
-                            <a class="c9" href="http://go.microsoft.com/?linkid=9840733">http://go.microsoft.com/?linkid=9840733</a>
+                            <a class="c9"
                                href="http://go.microsoft.com/?linkid=9840733">http://go.microsoft.com/?linkid=9840733</a>
                        </span>
                        <span class="c3 c1">.</span>
                    </p>
@ -515,48 +578,62 @@
                        <span class="c5 c1">6.</span>
                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        <span class="c5 c1">FEEDBACK. </span>
-                        <span class="c3 c1">If you give feedback about the software to Microsoft, you give to Microsoft, without charge, the
+                        <span class="c3 c1">If you give feedback about the software to Microsoft, you give to Microsoft,
                            without charge, the
                            right to use, share and commercialize your feedback in any way and for any purpose. You will
-                            not give feedback that is subject to a license that requires Microsoft to license its software
+                            not give feedback that is subject to a license that requires Microsoft to license its
-                            or documentation to third parties because we include your feedback in them. These rights survive
+                            software
                            or documentation to third parties because we include your feedback in them. These rights
                            survive
                            this agreement.</span>
                    </p>
                    <p class="c2">
                        <span class="c5 c1">7.</span>
                        <span class="c1">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        <span class="c5 c1">SCOPE OF LICENSE.</span>
-                        <span class="c3 c1">&nbsp;The software is licensed, not sold. This agreement only gives you some rights to use the software.
+                        <span class="c3 c1">&nbsp;The software is licensed, not sold. This agreement only gives you some
-                            Microsoft reserves all other rights. Unless applicable law gives you more rights despite this
+                            rights to use the software.
                            Microsoft reserves all other rights. Unless applicable law gives you more rights despite
                            this
                            limitation, you may use the software only as expressly permitted in this agreement. &nbsp;In
                            doing so, you must comply with any technical limitations in the software that only allow you
                            to use it in certain ways. You may not:</span>
                    </p>
                    <p class="c8">
-                        <span class="c3 c1">- &nbsp; &nbsp; work around any technical limitations in the software;</span>
+                        <span class="c3 c1">- &nbsp; &nbsp; work around any technical limitations in the
                            software;</span>
                    </p>
                    <p class="c8">
-                        <span class="c3 c1">- &nbsp; &nbsp; reverse engineer, decompile or disassemble the software, or attempt to do so, except
+                        <span class="c3 c1">- &nbsp; &nbsp; reverse engineer, decompile or disassemble the software, or
                            attempt to do so, except
                            and only to the extent required by third party licensing terms governing use of certain open
                            source components that may be included with the software;</span>
                    </p>
                    <p class="c8">
-                        <span class="c3 c1">- &nbsp; &nbsp; remove, minimize, block or modify any notices of Microsoft or its suppliers in the
+                        <span class="c3 c1">- &nbsp; &nbsp; remove, minimize, block or modify any notices of Microsoft
                            or its suppliers in the
                            software;
                        </span>
                    </p>
                    <p class="c8">
-                        <span class="c3 c1">- &nbsp; &nbsp; use the software in any way that is against the law; or</span>
+                        <span class="c3 c1">- &nbsp; &nbsp; use the software in any way that is against the law;
                            or</span>
                    </p>
                    <p class="c8">
-                        <span class="c3 c1">- &nbsp; &nbsp; share, publish, rent or lease the software, or provide the software as a stand-alone
+                        <span class="c3 c1">- &nbsp; &nbsp; share, publish, rent or lease the software, or provide the
                            software as a stand-alone
                            offering for others to use.</span>
                    </p>
                    <p class="c2">
                        <span class="c5 c1">8. &nbsp; UPDATES. </span>
-                        <span class="c3 c1">The software may periodically check for updates and download and install them for you. You may obtain
+                        <span class="c3 c1">The software may periodically check for updates and download and install
-                            updates only from Microsoft or authorized sources. Microsoft may need to update your system to
+                            them for you. You may obtain
-                            provide you with updates. You agree to receive these automatic updates without any additional
+                            updates only from Microsoft or authorized sources. Microsoft may need to update your system
-                            notice. Updates may not include or support all existing software features, services, or peripheral
+                            to
                            provide you with updates. You agree to receive these automatic updates without any
                            additional
                            notice. Updates may not include or support all existing software features, services, or
                            peripheral
                            devices.
                        </span>
                    </p>
@ -564,57 +641,74 @@
                        <span class="c5 c1">9.</span>
                        <span class="c1">&nbsp; &nbsp;</span>
                        <span class="c5 c1">EXPORT RESTRICTIONS.</span>
-                        <span class="c3 c1">&nbsp;You must comply with all domestic and international export laws and regulations that apply
+                        <span class="c3 c1">&nbsp;You must comply with all domestic and international export laws and
-                            to the software, which include restrictions on destinations, end users and end use. For further
+                            regulations that apply
                            to the software, which include restrictions on destinations, end users and end use. For
                            further
                            information on export restrictions, visit (aka.ms/exporting).</span>
                    </p>
                    <p class="c2">
                        <span class="c5 c1">10.</span>
                        <span class="c1">&nbsp;</span>
                        <span class="c5 c1">SUPPORT SERVICES. </span>
-                        <span class="c3 c1">Because the software is &ldquo;as is,&rdquo; we may not provide support services for it.</span>
+                        <span class="c3 c1">Because the software is &ldquo;as is,&rdquo; we may not provide support
                            services for it.</span>
                    </p>
                    <p class="c2">
                        <span class="c5 c1">11.</span>
                        <span class="c1">&nbsp;</span>
                        <span class="c5 c1">ENTIRE AGREEMENT.</span>
-                        <span class="c3 c1">&nbsp;This agreement, and the terms for supplements, updates, Internet-based services and support
+                        <span class="c3 c1">&nbsp;This agreement, and the terms for supplements, updates, Internet-based
-                            services that you use, are the entire agreement for the software and support services.</span>
+                            services and support
                            services that you use, are the entire agreement for the software and support
                            services.</span>
                    </p>
                    <p class="c2">
                        <span class="c5 c1">12.</span>
                        <span class="c1">&nbsp;</span>
                        <span class="c5 c1">APPLICABLE LAW. </span>
-                        <span class="c3 c1">If you acquired the software in the United States, Washington State law applies to interpretation
+                        <span class="c3 c1">If you acquired the software in the United States, Washington State law
-                            of and claims for breach of this agreement, and the laws of the state where you live apply to
+                            applies to interpretation
                            of and claims for breach of this agreement, and the laws of the state where you live apply
                            to
                            all other claims. If you acquired the software in any other country, its laws apply.</span>
                    </p>
                    <p class="c2">
                        <span class="c5 c1">13.</span>
                        <span class="c1">&nbsp;</span>
                        <span class="c5 c1">CONSUMER RIGHTS; REGIONAL VARIATIONS. </span>
-                        <span class="c3 c1">This agreement describes certain legal rights. You may have other rights, including consumer rights,
+                        <span class="c3 c1">This agreement describes certain legal rights. You may have other rights,
-                            under the laws of your state or country. Separate and apart from your relationship with Microsoft,
+                            including consumer rights,
-                            you may also have rights with respect to the party from which you acquired the software. This
+                            under the laws of your state or country. Separate and apart from your relationship with
-                            agreement does not change those other rights if the laws of your state or country do not permit
+                            Microsoft,
-                            it to do so. For example, if you acquired the software in one of the below regions, or mandatory
+                            you may also have rights with respect to the party from which you acquired the software.
                            This
                            agreement does not change those other rights if the laws of your state or country do not
                            permit
                            it to do so. For example, if you acquired the software in one of the below regions, or
                            mandatory
                            country law applies, then the following provisions apply to you:</span>
                    </p>
                    <p class="c8">
                        <span class="c5 c1">a.</span>
                        <span class="c1">&nbsp; &nbsp;</span>
                        <span class="c5 c1">Australia. </span>
-                        <span class="c3 c1">You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is
+                        <span class="c3 c1">You have statutory guarantees under the Australian Consumer Law and nothing
                            in this agreement is
                            intended to affect those rights.</span>
                    </p>
                    <p class="c8">
                        <span class="c5 c1">b.</span>
                        <span class="c1">&nbsp; &nbsp;</span>
                        <span class="c5 c1">Canada. </span>
-                        <span class="c3 c1">If you acquired the software in Canada, you may stop receiving updates by turning off the automatic
+                        <span class="c3 c1">If you acquired the software in Canada, you may stop receiving updates by
-                            update feature, disconnecting your device from the Internet (if and when you re-connect to the
+                            turning off the automatic
-                            Internet, however, the software will resume checking for and installing updates), or uninstalling
+                            update feature, disconnecting your device from the Internet (if and when you re-connect to
-                            the software. The product documentation, if any, may also specify how to turn off updates for
+                            the
                            Internet, however, the software will resume checking for and installing updates), or
                            uninstalling
                            the software. The product documentation, if any, may also specify how to turn off updates
                            for
                            your specific device or software.</span>
                    </p>
                    <p class="c8">
@ -627,8 +721,10 @@
                        <span class="c5 c1">(i)</span>
                        <span class="c1">&nbsp; &nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        <span class="c5 c1">Warranty</span>
-                        <span class="c3 c1">. The properly licensed software will perform substantially as described in any Microsoft materials
+                        <span class="c3 c1">. The properly licensed software will perform substantially as described in
-                            that accompany the software. However, Microsoft gives no contractual guarantee in relation to
+                            any Microsoft materials
                            that accompany the software. However, Microsoft gives no contractual guarantee in relation
                            to
                            the licensed software.</span>
                    </p>
                    <p class="c6">
@ -638,74 +734,103 @@
                        <span class="c5 c1">(ii)</span>
                        <span class="c1">&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        <span class="c5 c1">Limitation of Liability</span>
-                        <span class="c3 c1">. In case of intentional conduct, gross negligence, claims based on the Product Liability Act, as
+                        <span class="c3 c1">. In case of intentional conduct, gross negligence, claims based on the
-                            well as, in case of death or personal or physical injury, Microsoft is liable according to the
+                            Product Liability Act, as
                            well as, in case of death or personal or physical injury, Microsoft is liable according to
                            the
                            statutory law.</span>
                    </p>
                    <p class="c10">
-                        <span class="c3 c1">Subject to the foregoing clause (ii), Microsoft will only be liable for slight negligence if Microsoft
+                        <span class="c3 c1">Subject to the foregoing clause (ii), Microsoft will only be liable for
-                            is in breach of such material contractual obligations, the fulfillment of which facilitate the
+                            slight negligence if Microsoft
-                            due performance of this agreement, the breach of which would endanger the purpose of this agreement
+                            is in breach of such material contractual obligations, the fulfillment of which facilitate
-                            and the compliance with which a party may constantly trust in (so-called &quot;cardinal obligations&quot;).
+                            the
-                            In other cases of slight negligence, Microsoft will not be liable for slight negligence.</span>
+                            due performance of this agreement, the breach of which would endanger the purpose of this
                            agreement
                            and the compliance with which a party may constantly trust in (so-called &quot;cardinal
                            obligations&quot;).
                            In other cases of slight negligence, Microsoft will not be liable for slight
                            negligence.</span>
                    </p>
                    <p class="c2">
                        <span class="c5 c1">14.</span>
                        <span class="c1">&nbsp;</span>
                        <span class="c5 c1">LEGAL EFFECT.</span>
-                        <span class="c3 c1">&nbsp;This agreement describes certain legal rights. You may have other rights under the laws of
+                        <span class="c3 c1">&nbsp;This agreement describes certain legal rights. You may have other
-                            your country. You may also have rights with respect to the party from whom you acquired the software.
+                            rights under the laws of
-                            This agreement does not change your rights under the laws of your country if the laws of your
+                            your country. You may also have rights with respect to the party from whom you acquired the
                            software.
                            This agreement does not change your rights under the laws of your country if the laws of
                            your
                            country do not permit it to do so.</span>
                    </p>
                    <p class="c2">
                        <span class="c5 c1">15.</span>
                        <span class="c1">&nbsp;</span>
-                        <span class="c4 c1">DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED &ldquo;AS-IS.&rdquo; &nbsp;YOU BEAR THE RISK OF
+                        <span class="c4 c1">DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED &ldquo;AS-IS.&rdquo;
-                            USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. TO THE EXTENT PERMITTED
+                            &nbsp;YOU BEAR THE RISK OF
                            USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. TO THE EXTENT
                            PERMITTED
                            UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
                            FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.</span>
                    </p>
                    <p class="c2">
                        <span class="c5 c1">16.</span>
                        <span class="c1">&nbsp;</span>
-                        <span class="c4 c1">LIMITATION ON AND EXCLUSION OF DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT
+                        <span class="c4 c1">LIMITATION ON AND EXCLUSION OF DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND
-                            DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST
+                            ITS SUPPLIERS ONLY DIRECT
                            DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL,
                            LOST
                            PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.</span>
                    </p>
                    <p class="c0">
-                        <span class="c3 c1">This limitation applies to (a) anything related to the software, services, content (including code)
+                        <span class="c3 c1">This limitation applies to (a) anything related to the software, services,
-                            on third party Internet sites, or third party programs; and (b) claims for breach of contract,
+                            content (including code)
-                            breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the
+                            on third party Internet sites, or third party programs; and (b) claims for breach of
                            contract,
                            breach of warranty, guarantee or condition, strict liability, negligence, or other tort to
                            the
                            extent permitted by applicable law.</span>
                    </p>
                    <p class="c0">
-                        <span class="c3 c1">It also applies even if Microsoft knew or should have known about the possibility of the damages.
+                        <span class="c3 c1">It also applies even if Microsoft knew or should have known about the
-                            The above limitation or exclusion may not apply to you because your country may not allow the
+                            possibility of the damages.
                            The above limitation or exclusion may not apply to you because your country may not allow
                            the
                            exclusion or limitation of incidental, consequential or other damages.</span>
                    </p>
                    <p class="c12">
-                        <span class="c4 c1">Please note: As the software is distributed in Quebec, Canada, some of the clauses in this agreement
+                        <span class="c4 c1">Please note: As the software is distributed in Quebec, Canada, some of the
                            clauses in this agreement
                            are provided below in French.</span>
                    </p>
                    <p class="c12">
-                        <span class="c4 c1">Remarque : Ce logiciel &eacute;tant distribu&eacute; au Qu&eacute;bec, Canada, certaines des clauses
+                        <span class="c4 c1">Remarque : Ce logiciel &eacute;tant distribu&eacute; au Qu&eacute;bec,
                            Canada, certaines des clauses
                            dans ce contrat sont fournies ci-dessous en fran&ccedil;ais.</span>
                    </p>
                    <p class="c11">
                        <span class="c5 c1">EXON&Eacute;RATION DE GARANTIE.</span>
-                        <span class="c1 c3">&nbsp;Le logiciel vis&eacute; par une licence est offert &laquo; tel quel &raquo;. Toute utilisation
+                        <span class="c1 c3">&nbsp;Le logiciel vis&eacute; par une licence est offert &laquo; tel quel
-                            de ce logiciel est &agrave; votre seule risque et p&eacute;ril. Microsoft n&rsquo;accorde aucune
+                            &raquo;. Toute utilisation
-                            autre garantie expresse. Vous pouvez b&eacute;n&eacute;ficier de droits additionnels en vertu
+                            de ce logiciel est &agrave; votre seule risque et p&eacute;ril. Microsoft n&rsquo;accorde
-                            du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles
+                            aucune
-                            sont permises par le droit locale, les garanties implicites de qualit&eacute; marchande, d&rsquo;ad&eacute;quation
+                            autre garantie expresse. Vous pouvez b&eacute;n&eacute;ficier de droits additionnels en
                            vertu
                            du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou
                            elles
                            sont permises par le droit locale, les garanties implicites de qualit&eacute; marchande,
                            d&rsquo;ad&eacute;quation
                            &agrave; un usage particulier et d&rsquo;absence de contrefa&ccedil;on sont exclues.
                        </span>
                    </p>
                    <p class="c11">
-                        <span class="c5 c1">LIMITATION DES DOMMAGES-INT&Eacute;R&Ecirc;TS ET EXCLUSION DE RESPONSABILIT&Eacute; POUR LES DOMMAGES.</span>
+                        <span class="c5 c1">LIMITATION DES DOMMAGES-INT&Eacute;R&Ecirc;TS ET EXCLUSION DE
-                        <span class="c3 c1">&nbsp;Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages
+                            RESPONSABILIT&Eacute; POUR LES DOMMAGES.</span>
-                            directs uniquement &agrave; hauteur de 5,00 $ US. Vous ne pouvez pr&eacute;tendre &agrave; aucune
+                        <span class="c3 c1">&nbsp;Vous pouvez obtenir de Microsoft et de ses fournisseurs une
                            indemnisation en cas de dommages
                            directs uniquement &agrave; hauteur de 5,00 $ US. Vous ne pouvez pr&eacute;tendre &agrave;
                            aucune
                            indemnisation pour les autres dommages, y compris les dommages sp&eacute;ciaux, indirects ou
                            accessoires et pertes de b&eacute;n&eacute;fices.</span>
                    </p>
@ -713,26 +838,36 @@
                        <span class="c3 c1">Cette limitation concerne :</span>
                    </p>
                    <p class="c2">
-                        <span class="c3 c1">- &nbsp; &nbsp; &nbsp; &nbsp; tout ce qui est reli&eacute; au logiciel, aux services ou au contenu
+                        <span class="c3 c1">- &nbsp; &nbsp; &nbsp; &nbsp; tout ce qui est reli&eacute; au logiciel, aux
-                            (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et</span>
+                            services ou au contenu
                            (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ;
                            et</span>
                    </p>
                    <p class="c2">
-                        <span class="c3 c1">- &nbsp; &nbsp; &nbsp; &nbsp; les r&eacute;clamations au titre de violation de contrat ou de garantie,
+                        <span class="c3 c1">- &nbsp; &nbsp; &nbsp; &nbsp; les r&eacute;clamations au titre de violation
-                            ou au titre de responsabilit&eacute; stricte, de n&eacute;gligence ou d&rsquo;une autre faute
+                            de contrat ou de garantie,
                            ou au titre de responsabilit&eacute; stricte, de n&eacute;gligence ou d&rsquo;une autre
                            faute
                            dans la limite autoris&eacute;e par la loi en vigueur.</span>
                    </p>
                    <p class="c12">
-                        <span class="c3 c1">Elle s&rsquo;applique &eacute;galement, m&ecirc;me si Microsoft connaissait ou devrait conna&icirc;tre
+                        <span class="c3 c1">Elle s&rsquo;applique &eacute;galement, m&ecirc;me si Microsoft connaissait
                            ou devrait conna&icirc;tre
                            l&rsquo;&eacute;ventualit&eacute; d&rsquo;un tel dommage. Si votre pays n&rsquo;autorise pas
-                            l&rsquo;exclusion ou la limitation de responsabilit&eacute; pour les dommages indirects, accessoires
+                            l&rsquo;exclusion ou la limitation de responsabilit&eacute; pour les dommages indirects,
-                            ou de quelque nature que ce soit, il se peut que la limitation ou l&rsquo;exclusion ci-dessus
+                            accessoires
                            ou de quelque nature que ce soit, il se peut que la limitation ou l&rsquo;exclusion
                            ci-dessus
                            ne s&rsquo;appliquera pas &agrave; votre &eacute;gard.</span>
                    </p>
                    <p class="c16">
                        <span class="c5 c1">EFFET JURIDIQUE.</span>
-                        <span class="c3 c1">&nbsp;Le pr&eacute;sent contrat d&eacute;crit certains droits juridiques. Vous pourriez avoir d&rsquo;autres
+                        <span class="c3 c1">&nbsp;Le pr&eacute;sent contrat d&eacute;crit certains droits juridiques.
-                            droits pr&eacute;vus par les lois de votre pays. Le pr&eacute;sent contrat ne modifie pas les
+                            Vous pourriez avoir d&rsquo;autres
-                            droits que vous conf&egrave;rent les lois de votre pays si celles-ci ne le permettent pas.</span>
+                            droits pr&eacute;vus par les lois de votre pays. Le pr&eacute;sent contrat ne modifie pas
                            les
                            droits que vous conf&egrave;rent les lois de votre pays si celles-ci ne le permettent
                            pas.</span>
                    </p>
                    <p class="c15">
                        <span class="c3 c1"></span>
@ -740,9 +875,9 @@
                    <p class="c16">
                        <span class="c3 c1">&nbsp;</span>
                    </p>
                    <p class="c11">
-                        <span class="c3 c1">LEGO, the LEGO logo, MINDSTORMS and the MINDSTORMS EV3 logo are trademarks and/ or copyrights of
+                        <span class="c3 c1">@copyrightText@</span>
                            the LEGO Group. &copy;2018 The LEGO Group. All rights reserved.</span>
                    </p>
                    <p class="c11">
                        <span class="c3 c1">&nbsp;</span>
@ -755,27 +890,30 @@
                    </p>
                </div>
            </div>
-            <div class="ui center aligned segment">
+            <div id="agree-segment" class="ui center aligned segment hidden">
                <input id="agree-checkbox" type="checkbox" autocomplete="off" onchange="agreeCheckboxChanged(this)">
                <label for="agree-checkbox">I agree to these Microsoft Software License Terms and to the
                    <a href="https://privacy.microsoft.com/en-us/privacystatement">Microsoft Privacy Statement.</a>
                </label>
            </div>
            <div id="no-download-segment" class="ui center aligned segment hidden">
                <p>Sorry, there is no Offline App available for this editor.</p>
            </div>
            <div id="download-segment" class="ui center aligned segment hidden">
                <div class="ui grid">
                    <div class="eight wide column">
                        <h3 class="ui">Windows</h3>
-                        <button class="ui icon button" onclick="downloadWin64()">
+                        <a id="download-win64" class="ui icon button" onclick="downloadWin64()">
                            <i class="download icon"></i>
-                            makecode-ev3-setup-win64.exe
+                            makecode-@targetid@-setup-win64.exe
-                        </button>
+                        </a>
                    </div>
                    <div class="eight wide column">
                        <h3 class="ui">Mac OS</h3>
-                        <button class="ui icon button" onclick="downloadMac64()">
+                        <a id="download-mac64" class="ui icon button" onclick="downloadMac64()">
                            <i class="download icon"></i>
-                            makecode-ev3-mac64.zip
+                            makecode-@targetid@-mac64.zip
-                        </button>
+                        </a>
                    </div>
                </div>
            </div>
--- a/docs/static/MC-LEGO-loader-eyes.png
+++ b/docs/static/MC-LEGO-loader-eyes.png
--- a/docs/static/Microsoft-logo_rgb_c-gray-square.png
+++ b/docs/static/Microsoft-logo_rgb_c-gray-square.png
--- a/docs/static/Microsoft-logo_rgb_c-gray.png
+++ b/docs/static/Microsoft-logo_rgb_c-gray.png
--- a/docs/static/Microsoft-logo_rgb_c-white.png
+++ b/docs/static/Microsoft-logo_rgb_c-white.png
--- a/docs/static/about/blocks-to-js.png
+++ b/docs/static/about/blocks-to-js.png
--- a/docs/static/about/blocks-toolbox.png
+++ b/docs/static/about/blocks-toolbox.png
--- a/docs/static/about/download-button.png
+++ b/docs/static/about/download-button.png
--- a/docs/static/about/explorer-button.png
+++ b/docs/static/about/explorer-button.png
--- a/docs/static/about/explorer-view.png
+++ b/docs/static/about/explorer-view.png
--- a/docs/static/about/help-button.png
+++ b/docs/static/about/help-button.png
--- a/docs/static/about/home-button.png
+++ b/docs/static/about/home-button.png
--- a/docs/static/about/more-settings.png
+++ b/docs/static/about/more-settings.png
--- a/docs/static/about/redo-button.png
+++ b/docs/static/about/redo-button.png
--- a/docs/static/about/save-project.png
+++ b/docs/static/about/save-project.png
--- a/docs/static/about/share-button.png
+++ b/docs/static/about/share-button.png
--- a/docs/static/about/share-dialog.png
+++ b/docs/static/about/share-dialog.png
--- a/docs/static/about/undo-button.png
+++ b/docs/static/about/undo-button.png
--- a/docs/static/about/zoom-in.png
+++ b/docs/static/about/zoom-in.png
--- a/docs/static/about/zoom-out.png
+++ b/docs/static/about/zoom-out.png
--- a/docs/static/backgrounds/simulator.png
+++ b/docs/static/backgrounds/simulator.png
--- a/docs/static/bluetooth/experimental.png
+++ b/docs/static/bluetooth/experimental.png
--- a/docs/static/coding/autonomous-parking/auto-parking-connect.jpg
+++ b/docs/static/coding/autonomous-parking/auto-parking-connect.jpg
--- a/docs/static/coding/autonomous-parking/ev3-robot-driving-base.jpg
+++ b/docs/static/coding/autonomous-parking/ev3-robot-driving-base.jpg
--- a/docs/static/coding/line-detection/car-road-line.jpg
+++ b/docs/static/coding/line-detection/car-road-line.jpg
--- a/docs/static/coding/line-detection/ev3-color-squares.jpg
+++ b/docs/static/coding/line-detection/ev3-color-squares.jpg
--- a/docs/static/coding/line-detection/ev3-robot-color-sensor-down.jpg
+++ b/docs/static/coding/line-detection/ev3-robot-color-sensor-down.jpg
--- a/docs/static/coding/line-detection/ev3-robot-driving-base.jpg
+++ b/docs/static/coding/line-detection/ev3-robot-driving-base.jpg
--- a/docs/static/coding/object-detection/ev3-cuboid.jpg
+++ b/docs/static/coding/object-detection/ev3-cuboid.jpg
--- a/docs/static/coding/object-detection/ev3-robot-driving-base.jpg
+++ b/docs/static/coding/object-detection/ev3-robot-driving-base.jpg
--- a/docs/static/coding/object-detection/road-deer.jpg
+++ b/docs/static/coding/object-detection/road-deer.jpg
--- a/docs/static/configurations/chrome-version.png
+++ b/docs/static/configurations/chrome-version.png
--- a/docs/static/configurations/edge-version.png
+++ b/docs/static/configurations/edge-version.png
--- a/docs/static/configurations/firefox-version.png
+++ b/docs/static/configurations/firefox-version.png
--- a/docs/static/configurations/ie-version.png
+++ b/docs/static/configurations/ie-version.png
--- a/docs/static/configurations/osx-version.jpg
+++ b/docs/static/configurations/osx-version.jpg
--- a/docs/static/configurations/osx-version.png
+++ b/docs/static/configurations/osx-version.png
--- a/docs/static/configurations/safari-version.png
+++ b/docs/static/configurations/safari-version.png
--- a/docs/static/configurations/windows-version.png
+++ b/docs/static/configurations/windows-version.png
--- a/docs/static/download/firmware.png
+++ b/docs/static/download/firmware.png
--- a/docs/static/fll/code-js.png
+++ b/docs/static/fll/code-js.png
--- a/docs/static/fll/context-help.jpg
+++ b/docs/static/fll/context-help.jpg
--- a/docs/static/fll/fll-big.png
+++ b/docs/static/fll/fll-big.png
--- a/docs/static/fll/fll-logo.png
+++ b/docs/static/fll/fll-logo.png
--- a/docs/static/fll/import-button.jpg
+++ b/docs/static/fll/import-button.jpg
--- a/docs/static/fll/save-project.jpg
+++ b/docs/static/fll/save-project.jpg
--- a/docs/static/fll/share-button.jpg
+++ b/docs/static/fll/share-button.jpg
--- a/docs/static/fll/share-program.jpg
+++ b/docs/static/fll/share-program.jpg
--- a/docs/static/fll/share-program.png
+++ b/docs/static/fll/share-program.png
--- a/docs/static/fll/simulator.png
+++ b/docs/static/fll/simulator.png
--- a/docs/static/getting-started/01_EyesOn_Intro.png
+++ b/docs/static/getting-started/01_EyesOn_Intro.png
--- a/docs/static/getting-started/02_ApplePickerRobot.jpg
+++ b/docs/static/getting-started/02_ApplePickerRobot.jpg
--- a/docs/static/getting-started/02_PowerOn.png
+++ b/docs/static/getting-started/02_PowerOn.png
--- a/docs/static/getting-started/03_insert-usb-02.jpg
+++ b/docs/static/getting-started/03_insert-usb-02.jpg
--- a/docs/static/getting-started/03_insert-usb-02.png
+++ b/docs/static/getting-started/03_insert-usb-02.png
--- a/docs/static/getting-started/05_EyesOn.png
+++ b/docs/static/getting-started/05_EyesOn.png
--- a/docs/static/getting-started/06_PlugInLargeMotor.jpg
+++ b/docs/static/getting-started/06_PlugInLargeMotor.jpg
--- a/docs/static/getting-started/06_PlugInLargeMotor.png
+++ b/docs/static/getting-started/06_PlugInLargeMotor.png
--- a/docs/static/getting-started/08_WorkingLargeMotor.png
+++ b/docs/static/getting-started/08_WorkingLargeMotor.png
--- a/docs/static/getting-started/09_Connect_Touch.jpg
+++ b/docs/static/getting-started/09_Connect_Touch.jpg
--- a/docs/static/getting-started/09_Connect_Touch.png
+++ b/docs/static/getting-started/09_Connect_Touch.png
--- a/docs/static/getting-started/11_TouchMotorWorking.png
+++ b/docs/static/getting-started/11_TouchMotorWorking.png
--- a/docs/static/getting-started/12_ConnectColor.jpg
+++ b/docs/static/getting-started/12_ConnectColor.jpg
--- a/docs/static/getting-started/12_ConnectColor.png
+++ b/docs/static/getting-started/12_ConnectColor.png
--- a/docs/static/getting-started/14_ColorSensorWorking.jpg
+++ b/docs/static/getting-started/14_ColorSensorWorking.jpg
--- a/docs/static/getting-started/14_ColorSensorWorking.png
+++ b/docs/static/getting-started/14_ColorSensorWorking.png
--- a/docs/static/getting-started/15_Use-it.jpg
+++ b/docs/static/getting-started/15_Use-it.jpg
--- a/docs/static/getting-started/EV3_GettingStarted_13.jpg
+++ b/docs/static/getting-started/EV3_GettingStarted_13.jpg
--- a/docs/static/getting-started/Try-in-file-manager.jpg
+++ b/docs/static/getting-started/Try-in-file-manager.jpg
--- a/docs/static/getting-started/simulate.png
+++ b/docs/static/getting-started/simulate.png
--- a/docs/static/hero.jpg
+++ b/docs/static/hero.jpg
--- a/docs/static/hero.png
+++ b/docs/static/hero.png
--- a/docs/static/icons/android-chrome-192x192.png
+++ b/docs/static/icons/android-chrome-192x192.png
--- a/docs/static/icons/android-chrome-256x256.png
+++ b/docs/static/icons/android-chrome-256x256.png
--- a/docs/static/icons/apple-touch-icon.png
+++ b/docs/static/icons/apple-touch-icon.png
--- a/docs/static/icons/favicon-16x16.png
+++ b/docs/static/icons/favicon-16x16.png
--- a/docs/static/icons/favicon-32x32.png
+++ b/docs/static/icons/favicon-32x32.png
--- a/docs/static/icons/mstile-150x150.png
+++ b/docs/static/icons/mstile-150x150.png
--- a/docs/static/labview/brake.png
+++ b/docs/static/labview/brake.png
--- a/docs/static/labview/brickimage.png
+++ b/docs/static/labview/brickimage.png
--- a/docs/static/labview/brickstatuslight.png
+++ b/docs/static/labview/brickstatuslight.png
--- a/docs/static/labview/ife.png
+++ b/docs/static/labview/ife.png
--- a/docs/static/labview/invertmotor.png
+++ b/docs/static/labview/invertmotor.png
--- a/docs/static/labview/lighttospeed.png
+++ b/docs/static/labview/lighttospeed.png
--- a/docs/static/labview/motors.png
+++ b/docs/static/labview/motors.png
--- a/docs/static/labview/multipleloops.png
+++ b/docs/static/labview/multipleloops.png
--- a/docs/static/labview/pausefordistance.png
+++ b/docs/static/labview/pausefordistance.png
--- a/docs/static/labview/pausefortime.png
+++ b/docs/static/labview/pausefortime.png
--- a/docs/static/labview/pausefortouch.png
+++ b/docs/static/labview/pausefortouch.png
--- a/docs/static/labview/random.png
+++ b/docs/static/labview/random.png
--- a/docs/static/labview/sequencing.png
+++ b/docs/static/labview/sequencing.png
--- a/docs/static/labview/speedoflight.png
+++ b/docs/static/labview/speedoflight.png
--- a/docs/static/labview/speedoflightvar.png
+++ b/docs/static/labview/speedoflightvar.png
--- a/docs/static/labview/steer.png
+++ b/docs/static/labview/steer.png
--- a/docs/static/labview/tank.png
+++ b/docs/static/labview/tank.png
--- a/docs/static/labview/unregulatedmotor.png
+++ b/docs/static/labview/unregulatedmotor.png
--- a/docs/static/labview/while.png
+++ b/docs/static/labview/while.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Peli de Halleux	8fd0bf92fa	move electron to v1.1.22	2019-10-07 14:23:34 -07:00
Peli de Halleux	a33bff0520	offline template	2019-10-07 14:22:05 -07:00