From 43cc8d743cbae0c21c694621069c916109bdfbc7 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 16 Jun 2021 12:05:47 -0500 Subject: 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 --- src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl | 8 +++- src/ext/Bal/wixstdba/Resources/dncpreq.thm | 13 ++++++ src/ext/Bal/wixstdba/Resources/dncpreq.wxl | 4 ++ src/ext/Bal/wixstdba/Resources/mbapreq.thm | 13 ++++++ src/ext/Bal/wixstdba/Resources/mbapreq.wxl | 4 ++ .../WixStandardBootstrapperApplication.cpp | 47 +++++++++------------- 28 files changed, 215 insertions(+), 50 deletions(-) diff --git a/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl index abd35ac7..19e79bac 100644 --- a/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName] 安裝程式 [WixBundleName] 安裝程式需要 Microsoft .NET Framework 您確定要取消嗎? @@ -19,9 +19,15 @@ 安裝進度 正在處理: 取消(&) + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close 安裝失敗 一或多個問題導致安裝失敗。請修正這些問題，然後再重試安裝。如需詳細資訊，請查看<a href="#">記錄檔</a>。 必須重新啟動電腦，才能完成軟體的復原。 重新啟動(&R) 關閉(&C) + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl index e28b4f74..e6e6f469 100644 --- a/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl @@ -2,7 +2,7 @@ - + Instalace produktu [WixBundleName] Pro instalaci produktu [WixBundleName] je vyžadováno rozhraní Microsoft .NET Framework. Opravdu chcete akci zrušit? @@ -22,9 +22,15 @@ Průběh instalace Probíhá zpracování: &Storno + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Instalace se nezdařila 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>. Aby bylo možné zrušení instalace softwaru dokončit, je nutné počítač restartovat. &Restartovat &Zavřít + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl index a531467a..98518edc 100644 --- a/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl @@ -2,7 +2,7 @@ - + Installation af [WixBundleName] Microsoft .NET Framework skal være installeret i forbindelse med Installationen af [WixBundleName] Er du sikker på, at du vil annullere? @@ -22,9 +22,15 @@ Status for installation Behandler: &Annuller + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Installationen blev ikke gennemført 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. Du skal genstarte computeren for at fuldføre annulleringen af opdateringen af softwaren. &Genstart &Luk + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl index ff8111f9..e60b0c9a 100644 --- a/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName]-Setup @@ -25,9 +25,15 @@ Setup-Status Verarbeitung: &Abbrechen + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Setup-Fehler 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>. Sie müssen den Computer neu starten, um das Zurücksetzen der Software abzuschließen. &Neu starten &Schließen + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl index bc3703a3..ea5dc130 100644 --- a/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl @@ -2,7 +2,7 @@ - + Εγκατάσταση του [WixBundleName] Για την εγκατάσταση του [WixBundleName] απαιτείται το Microsoft .NET Framework Είστε βέβαιοι ότι θέλετε να γίνει ακύρωση; @@ -24,9 +24,15 @@ Πρόοδος εγκατάστασης Επεξεργασία: &Άκυρο + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Αποτυχία εγκατάστασης Ένα ή περισσότερα προβλήματα προκάλεσαν την αποτυχία της εγκατάστασης. Διορθώστε τα προβλήματα και μετά επαναλάβετε την εγκατάσταση. Για περισσότερες πληροφορίες, ανατρέξτε στο <a href="#">αρχείο καταγραφής</a>. Για να ολοκληρωθεί η επαναφορά του λογισμικού, πρέπει να κάνετε επανεκκίνηση του υπολογιστή. &Επανεκκίνηση &Κλείσιμο + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl index 859e5b23..803cacf5 100644 --- a/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName] -asennus Microsoft .NET Framework tarvitaan [WixBundleName] -asennusta varten Haluatko varmasti peruuttaa? @@ -22,9 +22,15 @@ Asennuksen edistyminen Käsitellään: &Peruuta + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Asennus epäonnistui Asennus epäonnistui yhdestä tai useammasta syystä. Korjaa ongelmat ja yritä suorittaa asennus sitten uudelleen. Lisätietoja on <a href="#">lokitiedostossa</a>. Tietokone täytyy käynnistää uudelleen ohjelmiston palautuksen viimeistelemiseksi. &Käynnistä uudelleen &Sulje + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl index f67dfa8e..fb927f2b 100644 --- a/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl @@ -2,7 +2,7 @@ - + Installation de [WixBundleName] Microsoft .NET Framework requis pour l'installation de [WixBundleName] Êtes-vous sûr de vouloir annuler ? @@ -22,9 +22,15 @@ Progression de l'installation Traitement en cours : &Annuler + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close L'installation a échoué 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>. Vous devez redémarrer votre ordinateur pour effectuer la restauration du logiciel. &Redémarrer &Fermer + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl index 6a4b109d..78c008b2 100644 --- a/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName] telepítő A(z) [WixBundleName] telepítéséhez Microsoft .NET-keretrendszer szükséges Biztosan megszakítja? @@ -22,9 +22,15 @@ Telepítési folyamat Feldolgozás: &Mégse + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close A telepítés nem sikerült 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. A szoftver visszaállításának befejezéséhez újra kell indítania a számítógépet. &Újraindítás &Bezárás + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl index f57d58e5..b7966340 100644 --- a/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl @@ -2,7 +2,7 @@ - + Installazione di [WixBundleName] Microsoft .NET Framework necessario per l'installazione di [WixBundleName] Annullare? @@ -23,9 +23,15 @@ Stato installazione Elaborazione in corso: &Annulla + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Installazione non riuscita 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>. È necessario riavviare il computer per completare il rollback del software. &Riavvia &Chiudi + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl index 3fe7b9b3..9b7aa323 100644 --- a/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName] セットアップ [WixBundleName] セットアップには Microsoft .NET Framework が必要です 取り消しますか? @@ -19,9 +19,15 @@ セットアップの進行状況 処理中: キャンセル(&C) + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close セットアップに失敗しました 1 つ以上の問題が原因でセットアップに失敗しました。問題を解決してからセットアップをやり直してください。詳細については、<a href="#">ログ ファイル</a>を参照してください。 ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。 再起動(&R) 閉じる(&C) + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl index 0f53dcc3..445d445b 100644 --- a/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName] 설치 [WixBundleName] 설치에 필요한 Microsoft .NET Framework 취소하시겠습니까? @@ -19,9 +19,15 @@ 설치 진행률 처리 중: 취소(&C) + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close 설치 실패 하나 이상의 문제로 인해 설치에 실패했습니다. 문제를 수정하고 설치를 다시 시도하십시오. 자세한 내용은 <a href="#">로그 파일</a>을 참조하십시오. 소프트웨어의 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다. 다시 시작(&R) 닫기(&C) + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl index f4a2c78c..60ba996e 100644 --- a/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName] Installatie Microsoft .NET Framework is vereist voor installatie [WixBundleName] Weet u zeker dat u de installatie wilt annuleren? @@ -22,9 +22,15 @@ Voortgang van de installatie Verwerken: &Annuleren + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Installatie mislukt 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. U moet uw computer opnieuw opstarten om het terugdraaien van de software te voltooien. &Opnieuw opstarten &Sluiten + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl index da5c8283..e0718b8d 100644 --- a/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName] Installasjonsprogram Microsoft .NET Framework kreves for [WixBundleName]-installasjon Er du sikker på at du vil avbryte? @@ -22,9 +22,15 @@ Fremdrift for installasjon Behandler: &Avbryt + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Installasjon mislyktes 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>. Du må starte datamaskinen på nytt for å fullføre tilbakerullingen av programvaren. &Start på nytt &Lukk + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl index 7aca87c2..8b4eb758 100644 --- a/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl @@ -2,7 +2,7 @@ - + Instalator programu [WixBundleName] Do zainstalowania programu [WixBundleName] jest wymagany program Microsoft .NET Framework Czy na pewno chcesz anulować? @@ -22,9 +22,15 @@ Postęp instalacji Trwa przetwarzanie: &Anuluj + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Instalacja nie powiodła się 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>. Aby zakończyć wycofywanie oprogramowania, musisz ponownie uruchomić komputer. &Uruchom ponownie &Zamknij + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl index be185502..0155eb39 100644 --- a/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName] Instalação Microsoft .NET Framework é necessário para instalação do [WixBundleName] Tem certeza de que deseja cancelar? @@ -21,9 +21,15 @@ Progresso da Instalação Processando: &Cancelar + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Falha na Instalação 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>. Você deve reiniciar o computador para completar a reversão do software. &Reiniciar &Fechar + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl index a1aec7ed..87350745 100644 --- a/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl @@ -2,7 +2,7 @@ - + Установка [WixBundleName] Для установки [WixBundleName] требуется Microsoft .NET Framework Вы действительно хотите отменить операцию? @@ -21,9 +21,15 @@ Выполнение установки Обработка: &Отмена + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Сбой установки Не удалось выполнить установку из-за одной или нескольких проблем. Устраните эти проблемы, а затем снова запустите программу установки. Дополнительные сведения см. в <a href="#">файле журнала</a>. Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения. &Перезагрузить &Закрыть + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl index 9f0b4711..7645a37f 100644 --- a/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName] – inštalácia Na inštaláciu aplikácie [WixBundleName] sa vyžaduje súčasť Microsoft .NET Framework Naozaj chcete zrušiť operáciu? @@ -22,9 +22,15 @@ Priebeh inštalácie Spracúva sa: &Zrušiť + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Inštalácia zlyhala 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>. Dokončenie všetkých zmien softvéru vyžaduje reštart počítača. &Reštartovať &Zavrieť + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl index 72961409..b00205d8 100644 --- a/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName]-installation Microsoft .NET Framework krävs för installation av [WixBundleName] Vill du avbryta? @@ -22,9 +22,15 @@ Installationsförlopp Bearbetar: &Avbryt + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Installationen misslyckades 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. Starta om datorn för att återställa programmet. &Starta om &Stäng + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl index ee52da98..00c3c187 100644 --- a/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName] Kurulumu [WixBundleName] kurulumu için Microsoft .NET Framework gerekir İptal etmek istediğinizden emin misiniz? @@ -22,9 +22,15 @@ Kurulum İlerleme Durumu İşleniyor: &İptal + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Kurulum Başarısız 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. Yazılım geri alma işlemini tamamlamak için bilgisayarınızı yeniden başlatmanız gerekir. &Yeniden Başlat &Kapat + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl index f3b4bfe5..72d48267 100644 --- a/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName] Namestitev Microsoft .NET Framework, potreben za namestitev paketa [WixBundleName] Ali ste prepričani, da želite preklicati? @@ -22,9 +22,15 @@ Potek namestitve Obdelovanje: &Prekliči + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Namestitev ni uspela 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>. Za povrnitev prejšnjega stanja programske opreme morate ponovno zagnati računalnik. &Ponovni zagon &Zapri + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl index 63cdb418..365ee7e6 100644 --- a/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl @@ -2,7 +2,7 @@ - + [WixBundleName] 安装 [WixBundleName] 安装需要 Microsoft .NET Framework 是否确实要取消? @@ -19,9 +19,15 @@ 安装进度 正在处理: 取消(&C) + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close 安装失败 一个或多个问题导致安装失败。请解决问题，然后重新尝试安装。有关详情，请查看<a href="#">日志文件</a>。 必须重启计算机才能完成软件的回滚。 重启(&R) 关闭(&C) + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl index 6a49ca31..442a5571 100644 --- a/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl @@ -2,7 +2,7 @@ - + Configuração do [WixBundleName] O Microsoft .NET Framework é necessário para a configuração do [WixBundleName] Tem a certeza de que pretende cancelar? @@ -21,9 +21,15 @@ Progresso da Configuração A processar: &Cancelar + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Falha da Configuração 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>. Tem de reiniciar o computador para concluir a reversão do software. &Reiniciar &Fechar + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl index 0290624c..37c0dc05 100644 --- a/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl @@ -2,7 +2,7 @@ - + Instalación de [WixBundleName] La instalación de [WixBundleName] requiere Microsoft .NET Framework ¿Está seguro de que desea cancelar? @@ -23,9 +23,15 @@ Progreso de la instalación Procesando: &Cancelar + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Error de la instalación 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>. Debe reiniciar el equipo para completar la reversión del software. &Reiniciar &Cerrar + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. diff --git a/src/ext/Bal/wixstdba/Resources/dncpreq.thm b/src/ext/Bal/wixstdba/Resources/dncpreq.thm index 4ae61819..fda84004 100644 --- a/src/ext/Bal/wixstdba/Resources/dncpreq.thm +++ b/src/ext/Bal/wixstdba/Resources/dncpreq.thm @@ -32,6 +32,19 @@ + + + + + + #(loc.FailureLogLinkText) diff --git a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl b/src/ext/Bal/wixstdba/Resources/dncpreq.wxl index d6b73b5f..a53b1c83 100644 --- a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/dncpreq.wxl @@ -19,6 +19,10 @@ Setup Progress Processing: &Cancel + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Setup Failed 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>. You must restart your computer to complete the rollback of the software. diff --git a/src/ext/Bal/wixstdba/Resources/mbapreq.thm b/src/ext/Bal/wixstdba/Resources/mbapreq.thm index 4ae61819..fda84004 100644 --- a/src/ext/Bal/wixstdba/Resources/mbapreq.thm +++ b/src/ext/Bal/wixstdba/Resources/mbapreq.thm @@ -32,6 +32,19 @@ + + + + + + #(loc.FailureLogLinkText) diff --git a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl index 95e3a6ae..5d410888 100644 --- a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl +++ b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl @@ -19,6 +19,10 @@ Setup Progress Processing: &Cancel + Microsoft .NET Framework Setup Successful + You must restart your computer before [WixBundleName] setup can continue. + &Restart + &Close Setup Failed 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>. You must restart your computer to complete the rollback of the software. diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp index a266fa1d..62cdc70a 100644 --- a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp @@ -228,9 +228,9 @@ public: // IBootstrapperApplication } // If a restart was required. - if (BOOTSTRAPPER_APPLY_RESTART_NONE != m_restartResult) + if (m_fRestartRequired) { - if (m_fRestartRequired && m_fAllowRestart) + if (m_fShouldRestart && m_fAllowRestart) { *pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART; } @@ -1097,13 +1097,13 @@ public: // IBootstrapperApplication __super::OnApplyComplete(hrStatus, restart, recommendation, pAction); 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. - - // If a restart was encountered and we are not suppressing restarts, then restart is required. - m_fRestartRequired = (BOOTSTRAPPER_APPLY_RESTART_NONE != restart && BOOTSTRAPPER_RESTART_NEVER < m_command.restart); + m_fRestartRequired = BOOTSTRAPPER_APPLY_RESTART_NONE != restart; BalSetStringVariable(WIXSTDBA_VARIABLE_RESTART_REQUIRED, m_fRestartRequired ? L"1" : NULL, FALSE); - // 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. - m_fAllowRestart = m_fRestartRequired && (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BOOTSTRAPPER_RESTART_PROMPT < m_command.restart); + m_fShouldRestart = m_fRestartRequired && BOOTSTRAPPER_RESTART_NEVER < m_command.restart; + + // Automatically restart if we're not displaying a UI or the command line said to always allow restarts. + m_fAllowRestart = m_fShouldRestart && (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BOOTSTRAPPER_RESTART_PROMPT < m_command.restart); if (m_fPrereq) { @@ -3163,20 +3163,11 @@ private: // privates m_state = state; // If our install is at the end (success or failure) and we're not showing full UI or - // we successfully installed the prerequisite then exit (prompt for restart if required). + // we successfully installed the prerequisite(s) and either no restart is required or can automatically restart + // then exit. if ((WIXSTDBA_STATE_APPLIED <= m_state && BOOTSTRAPPER_DISPLAY_FULL > m_command.display) || - (WIXSTDBA_STATE_APPLIED == m_state && m_fPrereq)) + (WIXSTDBA_STATE_APPLIED == m_state && m_fPrereq && (!m_fRestartRequired || m_fShouldRestart && m_fAllowRestart))) { - // If a restart was required but we were not automatically allowed to - // accept the reboot then do the prompt. - if (m_fRestartRequired && !m_fAllowRestart) - { - StrAllocFromError(&sczUnformattedText, HRESULT_FROM_WIN32(ERROR_SUCCESS_REBOOT_REQUIRED), NULL); - - 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); - m_fAllowRestart = (IDOK == nResult); - } - // Quietly exit. ::PostMessageW(m_hWnd, WM_CLOSE, 0, 0); } @@ -3214,13 +3205,13 @@ private: // privates } else if (m_rgdwPageIds[WIXSTDBA_PAGE_SUCCESS] == dwNewPageId) // on the "Success" page, check if the restart or launch button should be enabled. { - BOOL fShowRestartButton = FALSE; + BOOL fEnableRestartButton = FALSE; BOOL fLaunchTargetExists = FALSE; - if (m_fRestartRequired) + if (m_fShouldRestart) { if (BOOTSTRAPPER_RESTART_PROMPT == m_command.restart) { - fShowRestartButton = TRUE; + fEnableRestartButton = TRUE; } } else if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON)) @@ -3229,13 +3220,13 @@ private: // privates } ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON, fLaunchTargetExists && BOOTSTRAPPER_ACTION_UNINSTALL < m_plannedAction); - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, fShowRestartButton); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, fEnableRestartButton); } else if (m_rgdwPageIds[WIXSTDBA_PAGE_FAILURE] == dwNewPageId) // on the "Failure" page, show error message and check if the restart button should be enabled. { BOOL fShowLogLink = (m_Bundle.sczLogVariable && *m_Bundle.sczLogVariable); // if there is a log file variable then we'll assume the log file exists. BOOL fShowErrorMessage = FALSE; - BOOL fShowRestartButton = FALSE; + BOOL fEnableRestartButton = FALSE; if (FAILED(m_hrFinal)) { @@ -3317,17 +3308,17 @@ private: // privates fShowErrorMessage = TRUE; } - if (m_fRestartRequired) + if (m_fShouldRestart) { if (BOOTSTRAPPER_RESTART_PROMPT == m_command.restart) { - fShowRestartButton = TRUE; + fEnableRestartButton = TRUE; } } ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK, fShowLogLink); ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, fShowErrorMessage); - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, fShowRestartButton); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, fEnableRestartButton); } HRESULT hr = ThemeShowPage(m_pTheme, dwOldPageId, SW_HIDE); @@ -3977,6 +3968,7 @@ public: m_fDowngrading = FALSE; m_restartResult = BOOTSTRAPPER_APPLY_RESTART_NONE; m_fRestartRequired = FALSE; + m_fShouldRestart = FALSE; m_fAllowRestart = FALSE; m_sczLicenseFile = NULL; @@ -4079,6 +4071,7 @@ private: BOOL m_fDowngrading; BOOTSTRAPPER_APPLY_RESTART m_restartResult; BOOL m_fRestartRequired; + BOOL m_fShouldRestart; BOOL m_fAllowRestart; LPWSTR m_sczLicenseFile; -- cgit v1.2.3-55-g6feb