Add Success page to prereq BA.
This was needed to explain to the user that a restart is required but not allowed. It also allows localizing the reboot prompt. Fixes #3957, #5395
Sean Hall committed
Jun 16, 2021 at 12:05 UTC
43cc8d743cbae0c21c694621069c916109bdfbc7
28 files changed
+215
-50
src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="zh-tw" Language="1028" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="zh-tw" Language="1028" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName] 安裝程式</String>
7
<String Id="Title">[WixBundleName] 安裝程式需要 Microsoft .NET Framework</String>
8
<String Id="ConfirmCancelMessage">您確定要取消嗎?</String>
@@ -19,9 +19,15 @@
19
<String Id="ProgressHeader">安裝進度</String>
20
<String Id="ProgressLabel">正在處理:</String>
21
<String Id="ProgressCancelButton">取消(&)</String>
22
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
23
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
24
+ <String Id="SuccessRestartButton">&Restart</String>
25
+ <String Id="SuccessCloseButton">&Close</String>
26
<String Id="FailureHeader">安裝失敗</String>
27
<String Id="FailureLogLinkText">一或多個問題導致安裝失敗。請修正這些問題，然後再重試安裝。如需詳細資訊，請查看<a href="#">記錄檔</a>。</String>
28
<String Id="FailureRestartText">必須重新啟動電腦，才能完成軟體的復原。</String>
29
<String Id="FailureRestartButton">重新啟動(&R)</String>
30
<String Id="FailureCloseButton">關閉(&C)</String>
31
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
32
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
33
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="cs-cz" Language="1029" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="cs-cz" Language="1029" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">Instalace produktu [WixBundleName]</String>
7
<String Id="Title">Pro instalaci produktu [WixBundleName] je vyžadováno rozhraní Microsoft .NET Framework.</String>
8
<String Id="ConfirmCancelMessage">Opravdu chcete akci zrušit?</String>
@@ -22,9 +22,15 @@
22
<String Id="ProgressHeader">Průběh instalace</String>
23
<String Id="ProgressLabel">Probíhá zpracování:</String>
24
<String Id="ProgressCancelButton">&Storno</String>
25
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
26
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
27
+ <String Id="SuccessRestartButton">&Restart</String>
28
+ <String Id="SuccessCloseButton">&Close</String>
29
<String Id="FailureHeader">Instalace se nezdařila</String>
30
<String Id="FailureLogLinkText">Byly zjištěny problémy, kvůli kterým se instalaci nepodařilo dokončit. Odstraňte tyto problémy a potom instalaci opakujte. Další informace naleznete v <a href="#">souboru protokolu</a>.</String>
31
<String Id="FailureRestartText">Aby bylo možné zrušení instalace softwaru dokončit, je nutné počítač restartovat.</String>
32
<String Id="FailureRestartButton">&Restartovat</String>
33
<String Id="FailureCloseButton">&Zavřít</String>
34
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
35
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
36
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="da-dk" Language="1030" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="da-dk" Language="1030" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">Installation af [WixBundleName]</String>
7
<String Id="Title">Microsoft .NET Framework skal være installeret i forbindelse med Installationen af [WixBundleName]</String>
8
<String Id="ConfirmCancelMessage">Er du sikker på, at du vil annullere?</String>
@@ -22,9 +22,15 @@
22
<String Id="ProgressHeader">Status for installation</String>
23
<String Id="ProgressLabel">Behandler:</String>
24
<String Id="ProgressCancelButton">&Annuller</String>
25
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
26
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
27
+ <String Id="SuccessRestartButton">&Restart</String>
28
+ <String Id="SuccessCloseButton">&Close</String>
29
<String Id="FailureHeader">Installationen blev ikke gennemført</String>
30
<String Id="FailureLogLinkText">Installationen blev ikke gennemført på grund af et eller flere problemer. Løs problemerne, og prøv derefter at installere igen. Se <a href="#">logfilen</a> for at få flere oplysninger.</String>
31
<String Id="FailureRestartText">Du skal genstarte computeren for at fuldføre annulleringen af opdateringen af softwaren.</String>
32
<String Id="FailureRestartButton">&Genstart</String>
33
<String Id="FailureCloseButton">&Luk</String>
34
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
35
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
36
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="de-de" Language="1031" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="de-de" Language="1031" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<UI Control="InstallButton" Width="180" />
7
8
<String Id="Caption">[WixBundleName]-Setup</String>
@@ -25,9 +25,15 @@
25
<String Id="ProgressHeader">Setup-Status</String>
26
<String Id="ProgressLabel">Verarbeitung:</String>
27
<String Id="ProgressCancelButton">&Abbrechen</String>
28
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
29
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
30
+ <String Id="SuccessRestartButton">&Restart</String>
31
+ <String Id="SuccessCloseButton">&Close</String>
32
<String Id="FailureHeader">Setup-Fehler</String>
33
<String Id="FailureLogLinkText">Beim Setup ist aufgrund mindestens eines Problems ein Fehler aufgetreten. Beheben Sie die Probleme, und wiederholen Sie das Setup. Weitere Informationen finden Sie in der <a href="#">Protokolldatei</a>.</String>
34
<String Id="FailureRestartText">Sie müssen den Computer neu starten, um das Zurücksetzen der Software abzuschließen.</String>
35
<String Id="FailureRestartButton">&Neu starten</String>
36
<String Id="FailureCloseButton">&Schließen</String>
37
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
38
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
39
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="el-gr" Language="1032" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="el-gr" Language="1032" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">Εγκατάσταση του [WixBundleName]</String>
7
<String Id="Title">Για την εγκατάσταση του [WixBundleName] απαιτείται το Microsoft .NET Framework</String>
8
<String Id="ConfirmCancelMessage">Είστε βέβαιοι ότι θέλετε να γίνει ακύρωση;</String>
@@ -24,9 +24,15 @@
24
<String Id="ProgressHeader">Πρόοδος εγκατάστασης</String>
25
<String Id="ProgressLabel">Επεξεργασία:</String>
26
<String Id="ProgressCancelButton">&Άκυρο</String>
27
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
28
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
29
+ <String Id="SuccessRestartButton">&Restart</String>
30
+ <String Id="SuccessCloseButton">&Close</String>
31
<String Id="FailureHeader">Αποτυχία εγκατάστασης</String>
32
<String Id="FailureLogLinkText">Ένα ή περισσότερα προβλήματα προκάλεσαν την αποτυχία της εγκατάστασης. Διορθώστε τα προβλήματα και μετά επαναλάβετε την εγκατάσταση. Για περισσότερες πληροφορίες, ανατρέξτε στο <a href="#">αρχείο καταγραφής</a>.</String>
33
<String Id="FailureRestartText">Για να ολοκληρωθεί η επαναφορά του λογισμικού, πρέπει να κάνετε επανεκκίνηση του υπολογιστή.</String>
34
<String Id="FailureRestartButton">&Επανεκκίνηση</String>
35
<String Id="FailureCloseButton">&Κλείσιμο</String>
36
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
37
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
38
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="fi-fi" Language="1035" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="fi-fi" Language="1035" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName] -asennus</String>
7
<String Id="Title">Microsoft .NET Framework tarvitaan [WixBundleName] -asennusta varten</String>
8
<String Id="ConfirmCancelMessage">Haluatko varmasti peruuttaa?</String>
@@ -22,9 +22,15 @@
22
<String Id="ProgressHeader">Asennuksen edistyminen</String>
23
<String Id="ProgressLabel">Käsitellään:</String>
24
<String Id="ProgressCancelButton">&Peruuta</String>
25
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
26
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
27
+ <String Id="SuccessRestartButton">&Restart</String>
28
+ <String Id="SuccessCloseButton">&Close</String>
29
<String Id="FailureHeader">Asennus epäonnistui</String>
30
<String Id="FailureLogLinkText">Asennus epäonnistui yhdestä tai useammasta syystä. Korjaa ongelmat ja yritä suorittaa asennus sitten uudelleen. Lisätietoja on <a href="#">lokitiedostossa</a>.</String>
31
<String Id="FailureRestartText">Tietokone täytyy käynnistää uudelleen ohjelmiston palautuksen viimeistelemiseksi.</String>
32
<String Id="FailureRestartButton">&Käynnistä uudelleen</String>
33
<String Id="FailureCloseButton">&Sulje</String>
34
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
35
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
36
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="fr-fr" Language="1036" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="fr-fr" Language="1036" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">Installation de [WixBundleName]</String>
7
<String Id="Title">Microsoft .NET Framework requis pour l'installation de [WixBundleName]</String>
8
<String Id="ConfirmCancelMessage">Êtes-vous sûr de vouloir annuler ?</String>
@@ -22,9 +22,15 @@
22
<String Id="ProgressHeader">Progression de l'installation</String>
23
<String Id="ProgressLabel">Traitement en cours :</String>
24
<String Id="ProgressCancelButton">&Annuler</String>
25
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
26
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
27
+ <String Id="SuccessRestartButton">&Restart</String>
28
+ <String Id="SuccessCloseButton">&Close</String>
29
<String Id="FailureHeader">L'installation a échoué</String>
30
<String Id="FailureLogLinkText">L'installation a échoué pour une ou plusieurs raisons. Corrigez les problèmes et recommencez l'installation. Pour plus d'informations, consultez le <a href="#">fichier journal</a>.</String>
31
<String Id="FailureRestartText">Vous devez redémarrer votre ordinateur pour effectuer la restauration du logiciel.</String>
32
<String Id="FailureRestartButton">&Redémarrer</String>
33
<String Id="FailureCloseButton">&Fermer</String>
34
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
35
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
36
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="hu-hu" Language="1038" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="hu-hu" Language="1038" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName] telepítő</String>
7
<String Id="Title">A(z) [WixBundleName] telepítéséhez Microsoft .NET-keretrendszer szükséges</String>
8
<String Id="ConfirmCancelMessage">Biztosan megszakítja?</String>
@@ -22,9 +22,15 @@
22
<String Id="ProgressHeader">Telepítési folyamat</String>
23
<String Id="ProgressLabel">Feldolgozás:</String>
24
<String Id="ProgressCancelButton">&Mégse</String>
25
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
26
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
27
+ <String Id="SuccessRestartButton">&Restart</String>
28
+ <String Id="SuccessCloseButton">&Close</String>
29
<String Id="FailureHeader">A telepítés nem sikerült</String>
30
<String Id="FailureLogLinkText">Legalább egy olyan hiba lépett fel, amely a telepítés meghiúsulását okozta. Hárítsa el a hibákat, majd futtassa újra a telepítőt. További információt a <a href="#">naplófájlban </a> talál.</String>
31
<String Id="FailureRestartText">A szoftver visszaállításának befejezéséhez újra kell indítania a számítógépet.</String>
32
<String Id="FailureRestartButton">&Újraindítás</String>
33
<String Id="FailureCloseButton">&Bezárás</String>
34
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
35
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
36
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="it-it" Language="1040" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="it-it" Language="1040" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">Installazione di [WixBundleName]</String>
7
<String Id="Title">Microsoft .NET Framework necessario per l'installazione di [WixBundleName]</String>
8
<String Id="ConfirmCancelMessage">Annullare?</String>
@@ -23,9 +23,15 @@
23
<String Id="ProgressHeader">Stato installazione</String>
24
<String Id="ProgressLabel">Elaborazione in corso:</String>
25
<String Id="ProgressCancelButton">&Annulla</String>
26
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
27
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
28
+ <String Id="SuccessRestartButton">&Restart</String>
29
+ <String Id="SuccessCloseButton">&Close</String>
30
<String Id="FailureHeader">Installazione non riuscita</String>
31
<String Id="FailureLogLinkText">L'installazione non è riuscita a causa di uno o più problemi. Risolvere i problemi e provare di nuovo l'installazione. Per ulteriori informazioni vedere il <a href="#">file di log</a>.</String>
32
<String Id="FailureRestartText">È necessario riavviare il computer per completare il rollback del software.</String>
33
<String Id="FailureRestartButton">&Riavvia</String>
34
<String Id="FailureCloseButton">&Chiudi</String>
35
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
36
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
37
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="ja-jp" Language="1041" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="ja-jp" Language="1041" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName] セットアップ</String>
7
<String Id="Title">[WixBundleName] セットアップには Microsoft .NET Framework が必要です</String>
8
<String Id="ConfirmCancelMessage">取り消しますか?</String>
@@ -19,9 +19,15 @@
19
<String Id="ProgressHeader">セットアップの進行状況</String>
20
<String Id="ProgressLabel">処理中:</String>
21
<String Id="ProgressCancelButton">キャンセル(&C)</String>
22
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
23
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
24
+ <String Id="SuccessRestartButton">&Restart</String>
25
+ <String Id="SuccessCloseButton">&Close</String>
26
<String Id="FailureHeader">セットアップに失敗しました</String>
27
<String Id="FailureLogLinkText">1 つ以上の問題が原因でセットアップに失敗しました。問題を解決してからセットアップをやり直してください。詳細については、<a href="#">ログ ファイル</a>を参照してください。</String>
28
<String Id="FailureRestartText">ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。</String>
29
<String Id="FailureRestartButton">再起動(&R)</String>
30
<String Id="FailureCloseButton">閉じる(&C)</String>
31
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
32
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
33
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="ko-kr" Language="1042" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="ko-kr" Language="1042" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName] 설치</String>
7
<String Id="Title">[WixBundleName] 설치에 필요한 Microsoft .NET Framework</String>
8
<String Id="ConfirmCancelMessage">취소하시겠습니까?</String>
@@ -19,9 +19,15 @@
19
<String Id="ProgressHeader">설치 진행률</String>
20
<String Id="ProgressLabel">처리 중:</String>
21
<String Id="ProgressCancelButton">취소(&C)</String>
22
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
23
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
24
+ <String Id="SuccessRestartButton">&Restart</String>
25
+ <String Id="SuccessCloseButton">&Close</String>
26
<String Id="FailureHeader">설치 실패</String>
27
<String Id="FailureLogLinkText">하나 이상의 문제로 인해 설치에 실패했습니다. 문제를 수정하고 설치를 다시 시도하십시오. 자세한 내용은 <a href="#">로그 파일</a>을 참조하십시오.</String>
28
<String Id="FailureRestartText">소프트웨어의 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다.</String>
29
<String Id="FailureRestartButton">다시 시작(&R)</String>
30
<String Id="FailureCloseButton">닫기(&C)</String>
31
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
32
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
33
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="nl-nl" Language="1043" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="nl-nl" Language="1043" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName] Installatie</String>
7
<String Id="Title">Microsoft .NET Framework is vereist voor installatie [WixBundleName]</String>
8
<String Id="ConfirmCancelMessage">Weet u zeker dat u de installatie wilt annuleren?</String>
@@ -22,9 +22,15 @@
22
<String Id="ProgressHeader">Voortgang van de installatie</String>
23
<String Id="ProgressLabel">Verwerken:</String>
24
<String Id="ProgressCancelButton">&Annuleren</String>
25
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
26
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
27
+ <String Id="SuccessRestartButton">&Restart</String>
28
+ <String Id="SuccessCloseButton">&Close</String>
29
<String Id="FailureHeader">Installatie mislukt</String>
30
<String Id="FailureLogLinkText">Er zijn een of meer fouten opgetreden waardoor de installatie is mislukt. Corrigeer de problemen en voer Setup opnieuw uit. Raadpleeg het <a href="#">log boekbestand</a> voor meer informatie.</String>
31
<String Id="FailureRestartText">U moet uw computer opnieuw opstarten om het terugdraaien van de software te voltooien.</String>
32
<String Id="FailureRestartButton">&Opnieuw opstarten</String>
33
<String Id="FailureCloseButton">&Sluiten</String>
34
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
35
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
36
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="nb-no" Language="1044" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="nb-no" Language="1044" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName] Installasjonsprogram</String>
7
<String Id="Title">Microsoft .NET Framework kreves for [WixBundleName]-installasjon</String>
8
<String Id="ConfirmCancelMessage">Er du sikker på at du vil avbryte?</String>
@@ -22,9 +22,15 @@
22
<String Id="ProgressHeader">Fremdrift for installasjon</String>
23
<String Id="ProgressLabel">Behandler:</String>
24
<String Id="ProgressCancelButton">&Avbryt</String>
25
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
26
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
27
+ <String Id="SuccessRestartButton">&Restart</String>
28
+ <String Id="SuccessCloseButton">&Close</String>
29
<String Id="FailureHeader">Installasjon mislyktes</String>
30
<String Id="FailureLogLinkText">Ett eller flere problemer var årsak til at installasjonen mislyktes. Løs problemene, og installer på nytt. Du finner flere opplysninger i <a href="#">loggfilen</a>.</String>
31
<String Id="FailureRestartText">Du må starte datamaskinen på nytt for å fullføre tilbakerullingen av programvaren.</String>
32
<String Id="FailureRestartButton">&Start på nytt</String>
33
<String Id="FailureCloseButton">&Lukk</String>
34
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
35
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
36
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="pl-pl" Language="1045" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="pl-pl" Language="1045" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">Instalator programu [WixBundleName]</String>
7
<String Id="Title">Do zainstalowania programu [WixBundleName] jest wymagany program Microsoft .NET Framework</String>
8
<String Id="ConfirmCancelMessage">Czy na pewno chcesz anulować?</String>
@@ -22,9 +22,15 @@
22
<String Id="ProgressHeader">Postęp instalacji</String>
23
<String Id="ProgressLabel">Trwa przetwarzanie:</String>
24
<String Id="ProgressCancelButton">&Anuluj</String>
25
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
26
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
27
+ <String Id="SuccessRestartButton">&Restart</String>
28
+ <String Id="SuccessCloseButton">&Close</String>
29
<String Id="FailureHeader">Instalacja nie powiodła się</String>
30
<String Id="FailureLogLinkText">Co najmniej jeden problem spowodował niepowodzenie instalacji. Usuń problemy, a następnie ponów próbę instalacji. Aby uzyskać więcej informacji można znaleźć w <a href="#">pliku dziennika</a>.</String>
31
<String Id="FailureRestartText">Aby zakończyć wycofywanie oprogramowania, musisz ponownie uruchomić komputer.</String>
32
<String Id="FailureRestartButton">&Uruchom ponownie</String>
33
<String Id="FailureCloseButton">&Zamknij</String>
34
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
35
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
36
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="pt-br" Language="1046" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="pt-br" Language="1046" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName] Instalação</String>
7
<String Id="Title">Microsoft .NET Framework é necessário para instalação do [WixBundleName]</String>
8
<String Id="ConfirmCancelMessage">Tem certeza de que deseja cancelar?</String>
@@ -21,9 +21,15 @@
21
<String Id="ProgressHeader">Progresso da Instalação</String>
22
<String Id="ProgressLabel">Processando:</String>
23
<String Id="ProgressCancelButton">&Cancelar</String>
24
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
25
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
26
+ <String Id="SuccessRestartButton">&Restart</String>
27
+ <String Id="SuccessCloseButton">&Close</String>
28
<String Id="FailureHeader">Falha na Instalação</String>
29
<String Id="FailureLogLinkText">Um ou mais problemas causaram falha na instalação. Corrija os problemas e tente a instalação novamente. Para mais informações consulte o <a href="#">arquivo de log</a>.</String>
30
<String Id="FailureRestartText">Você deve reiniciar o computador para completar a reversão do software. </String>
31
<String Id="FailureRestartButton">&Reiniciar</String>
32
<String Id="FailureCloseButton">&Fechar</String>
33
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
34
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
35
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="ru-ru" Language="1049" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="ru-ru" Language="1049" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">Установка [WixBundleName]</String>
7
<String Id="Title">Для установки [WixBundleName] требуется Microsoft .NET Framework</String>
8
<String Id="ConfirmCancelMessage">Вы действительно хотите отменить операцию?</String>
@@ -21,9 +21,15 @@
21
<String Id="ProgressHeader">Выполнение установки</String>
22
<String Id="ProgressLabel">Обработка:</String>
23
<String Id="ProgressCancelButton">&Отмена</String>
24
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
25
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
26
+ <String Id="SuccessRestartButton">&Restart</String>
27
+ <String Id="SuccessCloseButton">&Close</String>
28
<String Id="FailureHeader">Сбой установки</String>
29
<String Id="FailureLogLinkText">Не удалось выполнить установку из-за одной или нескольких проблем. Устраните эти проблемы, а затем снова запустите программу установки. Дополнительные сведения см. в <a href="#">файле журнала</a>.</String>
30
<String Id="FailureRestartText">Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения.</String>
31
<String Id="FailureRestartButton">&Перезагрузить</String>
32
<String Id="FailureCloseButton">&Закрыть</String>
33
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
34
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
35
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="sk-sk" Language="1051" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="sk-sk" Language="1051" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName] – inštalácia</String>
7
<String Id="Title">Na inštaláciu aplikácie [WixBundleName] sa vyžaduje súčasť Microsoft .NET Framework</String>
8
<String Id="ConfirmCancelMessage">Naozaj chcete zrušiť operáciu?</String>
@@ -22,9 +22,15 @@
22
<String Id="ProgressHeader">Priebeh inštalácie</String>
23
<String Id="ProgressLabel">Spracúva sa:</String>
24
<String Id="ProgressCancelButton">&Zrušiť</String>
25
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
26
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
27
+ <String Id="SuccessRestartButton">&Restart</String>
28
+ <String Id="SuccessCloseButton">&Close</String>
29
<String Id="FailureHeader">Inštalácia zlyhala</String>
30
<String Id="FailureLogLinkText">Inštalácia zlyhala pre jednu alebo viac príčin. Odstráňte problémy a skúste znova spustiť inštaláciu. Ďalšie informácie nájdete v <a href="#">súbore denníka</a>.</String>
31
<String Id="FailureRestartText">Dokončenie všetkých zmien softvéru vyžaduje reštart počítača.</String>
32
<String Id="FailureRestartButton">&Reštartovať</String>
33
<String Id="FailureCloseButton">&Zavrieť</String>
34
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
35
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
36
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="sv-se" Language="1053" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="sv-se" Language="1053" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName]-installation</String>
7
<String Id="Title">Microsoft .NET Framework krävs för installation av [WixBundleName]</String>
8
<String Id="ConfirmCancelMessage">Vill du avbryta?</String>
@@ -22,9 +22,15 @@
22
<String Id="ProgressHeader">Installationsförlopp</String>
23
<String Id="ProgressLabel">Bearbetar:</String>
24
<String Id="ProgressCancelButton">&Avbryt</String>
25
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
26
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
27
+ <String Id="SuccessRestartButton">&Restart</String>
28
+ <String Id="SuccessCloseButton">&Close</String>
29
<String Id="FailureHeader">Installationen misslyckades</String>
30
<String Id="FailureLogLinkText">Installationen misslyckades på grund av ett eller flera problem. Åtgärda problemen och försök igen. Se <a href="#">loggfilen</a> för mer information.</String>
31
<String Id="FailureRestartText">Starta om datorn för att återställa programmet.</String>
32
<String Id="FailureRestartButton">&Starta om</String>
33
<String Id="FailureCloseButton">&Stäng</String>
34
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
35
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
36
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="tr-tr" Language="1055" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="tr-tr" Language="1055" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName] Kurulumu</String>
7
<String Id="Title">[WixBundleName] kurulumu için Microsoft .NET Framework gerekir</String>
8
<String Id="ConfirmCancelMessage">İptal etmek istediğinizden emin misiniz?</String>
@@ -22,9 +22,15 @@
22
<String Id="ProgressHeader">Kurulum İlerleme Durumu</String>
23
<String Id="ProgressLabel">İşleniyor:</String>
24
<String Id="ProgressCancelButton">&İptal</String>
25
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
26
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
27
+ <String Id="SuccessRestartButton">&Restart</String>
28
+ <String Id="SuccessCloseButton">&Close</String>
29
<String Id="FailureHeader">Kurulum Başarısız</String>
30
<String Id="FailureLogLinkText">Bir veya daha fazla sorun kurulumun başarısız olmasına neden oldu. Lütfen sorunları çözün ve kurulumu yeniden deneyin. Daha fazla bilgi için <a href="#">günlük dosyasına</a> bakın.</String>
31
<String Id="FailureRestartText">Yazılım geri alma işlemini tamamlamak için bilgisayarınızı yeniden başlatmanız gerekir.</String>
32
<String Id="FailureRestartButton">&Yeniden Başlat</String>
33
<String Id="FailureCloseButton">&Kapat</String>
34
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
35
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
36
</WixLocalization>
src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="sl-si" Language="1060" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="sl-si" Language="1060" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName] Namestitev</String>
7
<String Id="Title">Microsoft .NET Framework, potreben za namestitev paketa [WixBundleName]</String>
8
<String Id="ConfirmCancelMessage">Ali ste prepričani, da želite preklicati?</String>
@@ -22,9 +22,15 @@
22
<String Id="ProgressHeader">Potek namestitve</String>
23
<String Id="ProgressLabel">Obdelovanje:</String>
24
<String Id="ProgressCancelButton">&Prekliči</String>
25
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
26
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
27
+ <String Id="SuccessRestartButton">&Restart</String>
28
+ <String Id="SuccessCloseButton">&Close</String>
29
<String Id="FailureHeader">Namestitev ni uspela</String>
30
<String Id="FailureLogLinkText">Namestitev ni uspela zaradi ene ali več težav. Odpravite težave in ponovno zaženite namestitev. Za več informacij glejte <a href="#">dnevniško datoteko</a>.</String>
31
<String Id="FailureRestartText">Za povrnitev prejšnjega stanja programske opreme morate ponovno zagnati računalnik.</String>
32
<String Id="FailureRestartButton">&Ponovni zagon</String>
33
<String Id="FailureCloseButton">&Zapri</String>
34
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
35
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
36
</WixLocalization>
src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="zh-ch" Language="2052" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="zh-ch" Language="2052" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">[WixBundleName] 安装</String>
7
<String Id="Title">[WixBundleName] 安装需要 Microsoft .NET Framework</String>
8
<String Id="ConfirmCancelMessage">是否确实要取消?</String>
@@ -19,9 +19,15 @@
19
<String Id="ProgressHeader">安装进度</String>
20
<String Id="ProgressLabel">正在处理:</String>
21
<String Id="ProgressCancelButton">取消(&C)</String>
22
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
23
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
24
+ <String Id="SuccessRestartButton">&Restart</String>
25
+ <String Id="SuccessCloseButton">&Close</String>
26
<String Id="FailureHeader">安装失败</String>
27
<String Id="FailureLogLinkText">一个或多个问题导致安装失败。请解决问题，然后重新尝试安装。有关详情，请查看<a href="#">日志文件</a>。</String>
28
<String Id="FailureRestartText">必须重启计算机才能完成软件的回滚。</String>
29
<String Id="FailureRestartButton">重启(&R)</String>
30
<String Id="FailureCloseButton">关闭(&C)</String>
31
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
32
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
33
</WixLocalization>
src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="pt-pt" Language="2070" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="pt-pt" Language="2070" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">Configuração do [WixBundleName]</String>
7
<String Id="Title">O Microsoft .NET Framework é necessário para a configuração do [WixBundleName]</String>
8
<String Id="ConfirmCancelMessage">Tem a certeza de que pretende cancelar?</String>
@@ -21,9 +21,15 @@
21
<String Id="ProgressHeader">Progresso da Configuração</String>
22
<String Id="ProgressLabel">A processar:</String>
23
<String Id="ProgressCancelButton">&Cancelar</String>
24
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
25
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
26
+ <String Id="SuccessRestartButton">&Restart</String>
27
+ <String Id="SuccessCloseButton">&Close</String>
28
<String Id="FailureHeader">Falha da Configuração</String>
29
<String Id="FailureLogLinkText">Um ou mais problemas provocaram a falha da configuração. Corrija os problemas e repita a configuração. Para mais informações, consulte o <a href="#">ficheiro de registo</a>.</String>
30
<String Id="FailureRestartText">Tem de reiniciar o computador para concluir a reversão do software.</String>
31
<String Id="FailureRestartButton">&Reiniciar</String>
32
<String Id="FailureCloseButton">&Fechar</String>
33
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
34
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
35
</WixLocalization>
src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl
+7
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
5
-<WixLocalization Culture="es-es" Language="3082" xmlns="http://schemas.microsoft.com/wix/2006/localization">
5
+<WixLocalization Culture="es-es" Language="3082" xmlns="http://wixtoolset.org/schemas/v4/wxl">
6
<String Id="Caption">Instalación de [WixBundleName]</String>
7
<String Id="Title">La instalación de [WixBundleName] requiere Microsoft .NET Framework</String>
8
<String Id="ConfirmCancelMessage">¿Está seguro de que desea cancelar?</String>
@@ -23,9 +23,15 @@
23
<String Id="ProgressHeader">Progreso de la instalación</String>
24
<String Id="ProgressLabel">Procesando:</String>
25
<String Id="ProgressCancelButton">&Cancelar</String>
26
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
27
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
28
+ <String Id="SuccessRestartButton">&Restart</String>
29
+ <String Id="SuccessCloseButton">&Close</String>
30
<String Id="FailureHeader">Error de la instalación</String>
31
<String Id="FailureLogLinkText">No se pudo completar la instalación a causa de uno o varios problemas. Corrija los problemas y vuelva a intentar la instalación. Para más información, vea el <a href="#">archivo de registro</a>.</String>
32
<String Id="FailureRestartText">Debe reiniciar el equipo para completar la reversión del software.</String>
33
<String Id="FailureRestartButton">&Reiniciar</String>
34
<String Id="FailureCloseButton">&Cerrar</String>
35
+ <String Id="NET452WIN7RTMErrorMessage">[WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment.</String>
36
+ <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
37
</WixLocalization>
src/ext/Bal/wixstdba/Resources/dncpreq.thm
+13
@@ -32,6 +32,19 @@
32
<Progressbar Name="OverallCalculatedProgressbar" X="11" Y="175" Width="-11" Height="15" />
33
<Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
34
</Page>
35
+ <Page Name="Success">
36
+ <Label X="11" Y="112" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
37
+ <Text>#(loc.SuccessHeader)</Text>
38
+ </Label>
39
+ <Label X="-11" Y="-20" Width="400" Height="34" FontId="3" DisablePrefix="yes">
40
+ <Text>#(loc.SuccessRestartText)</Text>
41
+ </Label>
42
+ <Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
43
+ <Button Name="SuccessCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
44
+ <Text>#(loc.SuccessCloseButton)</Text>
45
+ <CloseWindowAction />
46
+ </Button>
47
+ </Page>
48
<Page Name="Failure">
49
<Label X="11" Y="112" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FailureHeader)</Label>
50
<Hypertext Name="FailureLogFileLink" X="11" Y="153" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureLogLinkText)</Hypertext>
src/ext/Bal/wixstdba/Resources/dncpreq.wxl
+4
@@ -19,6 +19,10 @@
19
<String Id="ProgressHeader">Setup Progress</String>
20
<String Id="ProgressLabel">Processing:</String>
21
<String Id="ProgressCancelButton">&Cancel</String>
22
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
23
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
24
+ <String Id="SuccessRestartButton">&Restart</String>
25
+ <String Id="SuccessCloseButton">&Close</String>
26
<String Id="FailureHeader">Setup Failed</String>
27
<String Id="FailureLogLinkText">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>.</String>
28
<String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
src/ext/Bal/wixstdba/Resources/mbapreq.thm
+13
@@ -32,6 +32,19 @@
32
<Progressbar Name="OverallCalculatedProgressbar" X="11" Y="175" Width="-11" Height="15" />
33
<Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
34
</Page>
35
+ <Page Name="Success">
36
+ <Label X="11" Y="112" Width="-11" Height="30" FontId="2" DisablePrefix="yes">
37
+ <Text>#(loc.SuccessHeader)</Text>
38
+ </Label>
39
+ <Label X="-11" Y="-20" Width="400" Height="34" FontId="3" DisablePrefix="yes">
40
+ <Text>#(loc.SuccessRestartText)</Text>
41
+ </Label>
42
+ <Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
43
+ <Button Name="SuccessCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
44
+ <Text>#(loc.SuccessCloseButton)</Text>
45
+ <CloseWindowAction />
46
+ </Button>
47
+ </Page>
48
<Page Name="Failure">
49
<Label X="11" Y="112" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FailureHeader)</Label>
50
<Hypertext Name="FailureLogFileLink" X="11" Y="153" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureLogLinkText)</Hypertext>
src/ext/Bal/wixstdba/Resources/mbapreq.wxl
+4
@@ -19,6 +19,10 @@
19
<String Id="ProgressHeader">Setup Progress</String>
20
<String Id="ProgressLabel">Processing:</String>
21
<String Id="ProgressCancelButton">&Cancel</String>
22
+ <String Id="SuccessHeader">Microsoft .NET Framework Setup Successful</String>
23
+ <String Id="SuccessRestartText">You must restart your computer before [WixBundleName] setup can continue.</String>
24
+ <String Id="SuccessRestartButton">&Restart</String>
25
+ <String Id="SuccessCloseButton">&Close</String>
26
<String Id="FailureHeader">Setup Failed</String>
27
<String Id="FailureLogLinkText">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>.</String>
28
<String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp
+20
-27
@@ -228,9 +228,9 @@ public: // IBootstrapperApplication
228
}
229
230
// If a restart was required.
231
- if (BOOTSTRAPPER_APPLY_RESTART_NONE != m_restartResult)
231
+ if (m_fRestartRequired)
232
{
233
- if (m_fRestartRequired && m_fAllowRestart)
233
+ if (m_fShouldRestart && m_fAllowRestart)
234
{
235
*pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART;
236
}
@@ -1097,13 +1097,13 @@ public: // IBootstrapperApplication
1097
__super::OnApplyComplete(hrStatus, restart, recommendation, pAction);
1098
1099
m_restartResult = restart; // remember the restart result so we return the correct error code no matter what the user chooses to do in the UI.
1100
-
1101
- // If a restart was encountered and we are not suppressing restarts, then restart is required.
1102
- m_fRestartRequired = (BOOTSTRAPPER_APPLY_RESTART_NONE != restart && BOOTSTRAPPER_RESTART_NEVER < m_command.restart);
1100
+ m_fRestartRequired = BOOTSTRAPPER_APPLY_RESTART_NONE != restart;
1101
BalSetStringVariable(WIXSTDBA_VARIABLE_RESTART_REQUIRED, m_fRestartRequired ? L"1" : NULL, FALSE);
1102
1105
- // If a restart is required and we're not displaying a UI or we are not supposed to prompt for restart then allow the restart.
1106
- m_fAllowRestart = m_fRestartRequired && (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BOOTSTRAPPER_RESTART_PROMPT < m_command.restart);
1103
+ m_fShouldRestart = m_fRestartRequired && BOOTSTRAPPER_RESTART_NEVER < m_command.restart;
1104
+
1105
+ // Automatically restart if we're not displaying a UI or the command line said to always allow restarts.
1106
+ m_fAllowRestart = m_fShouldRestart && (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BOOTSTRAPPER_RESTART_PROMPT < m_command.restart);
1107
1108
if (m_fPrereq)
1109
{
@@ -3163,20 +3163,11 @@ private: // privates
3163
m_state = state;
3164
3165
// If our install is at the end (success or failure) and we're not showing full UI or
3166
- // we successfully installed the prerequisite then exit (prompt for restart if required).
3166
+ // we successfully installed the prerequisite(s) and either no restart is required or can automatically restart
3167
+ // then exit.
3168
if ((WIXSTDBA_STATE_APPLIED <= m_state && BOOTSTRAPPER_DISPLAY_FULL > m_command.display) ||
3168
- (WIXSTDBA_STATE_APPLIED == m_state && m_fPrereq))
3169
+ (WIXSTDBA_STATE_APPLIED == m_state && m_fPrereq && (!m_fRestartRequired || m_fShouldRestart && m_fAllowRestart)))
3170
{
3170
- // If a restart was required but we were not automatically allowed to
3171
- // accept the reboot then do the prompt.
3172
- if (m_fRestartRequired && !m_fAllowRestart)
3173
- {
3174
- StrAllocFromError(&sczUnformattedText, HRESULT_FROM_WIN32(ERROR_SUCCESS_REBOOT_REQUIRED), NULL);
3175
-
3176
- int nResult = ::MessageBoxW(m_hWnd, sczUnformattedText ? sczUnformattedText : L"The requested operation is successful. Changes will not be effective until the system is rebooted.", m_pTheme->sczCaption, MB_ICONEXCLAMATION | MB_OKCANCEL);
3177
- m_fAllowRestart = (IDOK == nResult);
3178
- }
3179
-
3171
// Quietly exit.
3172
::PostMessageW(m_hWnd, WM_CLOSE, 0, 0);
3173
}
@@ -3214,13 +3205,13 @@ private: // privates
3205
}
3206
else if (m_rgdwPageIds[WIXSTDBA_PAGE_SUCCESS] == dwNewPageId) // on the "Success" page, check if the restart or launch button should be enabled.
3207
{
3217
- BOOL fShowRestartButton = FALSE;
3208
+ BOOL fEnableRestartButton = FALSE;
3209
BOOL fLaunchTargetExists = FALSE;
3219
- if (m_fRestartRequired)
3210
+ if (m_fShouldRestart)
3211
{
3212
if (BOOTSTRAPPER_RESTART_PROMPT == m_command.restart)
3213
{
3223
- fShowRestartButton = TRUE;
3214
+ fEnableRestartButton = TRUE;
3215
}
3216
}
3217
else if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON))
@@ -3229,13 +3220,13 @@ private: // privates
3220
}
3221
3222
ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON, fLaunchTargetExists && BOOTSTRAPPER_ACTION_UNINSTALL < m_plannedAction);
3232
- ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, fShowRestartButton);
3223
+ ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, fEnableRestartButton);
3224
}
3225
else if (m_rgdwPageIds[WIXSTDBA_PAGE_FAILURE] == dwNewPageId) // on the "Failure" page, show error message and check if the restart button should be enabled.
3226
{
3227
BOOL fShowLogLink = (m_Bundle.sczLogVariable && *m_Bundle.sczLogVariable); // if there is a log file variable then we'll assume the log file exists.
3228
BOOL fShowErrorMessage = FALSE;
3238
- BOOL fShowRestartButton = FALSE;
3229
+ BOOL fEnableRestartButton = FALSE;
3230
3231
if (FAILED(m_hrFinal))
3232
{
@@ -3317,17 +3308,17 @@ private: // privates
3308
fShowErrorMessage = TRUE;
3309
}
3310
3320
- if (m_fRestartRequired)
3311
+ if (m_fShouldRestart)
3312
{
3313
if (BOOTSTRAPPER_RESTART_PROMPT == m_command.restart)
3314
{
3324
- fShowRestartButton = TRUE;
3315
+ fEnableRestartButton = TRUE;
3316
}
3317
}
3318
3319
ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK, fShowLogLink);
3320
ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, fShowErrorMessage);
3330
- ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, fShowRestartButton);
3321
+ ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, fEnableRestartButton);
3322
}
3323
3324
HRESULT hr = ThemeShowPage(m_pTheme, dwOldPageId, SW_HIDE);
@@ -3977,6 +3968,7 @@ public:
3968
m_fDowngrading = FALSE;
3969
m_restartResult = BOOTSTRAPPER_APPLY_RESTART_NONE;
3970
m_fRestartRequired = FALSE;
3971
+ m_fShouldRestart = FALSE;
3972
m_fAllowRestart = FALSE;
3973
3974
m_sczLicenseFile = NULL;
@@ -4079,6 +4071,7 @@ private:
4071
BOOL m_fDowngrading;
4072
BOOTSTRAPPER_APPLY_RESTART m_restartResult;
4073
BOOL m_fRestartRequired;
4074
+ BOOL m_fShouldRestart;
4075
BOOL m_fAllowRestart;
4076
4077
LPWSTR m_sczLicenseFile;