@@ -136,10 +136,10 @@ discard block |
||
136 | 136 | !define MUI_HEADERIMAGE_BITMAP "cat_150.bmp" |
137 | 137 | !define MUI_COMPONENTSPAGE_SMALLDESC |
138 | 138 | |
139 | -!define WELCOME_HEADER "<?php printf(WindowsCommon::sprint_nsi(_("Welcome to the %s installer")),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])?>" |
|
140 | -!define FAREWELL_HEADER "<?php WindowsCommon::echo_nsi( _("Installation complete"))?>" |
|
141 | -!define FAREWELL_TEXT "<?php WindowsCommon::echo_nsi( _("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echo_nsi( _("Your system is ready."))?>" |
|
142 | -!define FAREWELL_FAIL "<?php WindowsCommon::echo_nsi( _("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echo_nsi( _("Please contact \${SUPPORT}."))?>" |
|
139 | +!define WELCOME_HEADER "<?php printf(WindowsCommon::sprint_nsi(_("Welcome to the %s installer")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])?>" |
|
140 | +!define FAREWELL_HEADER "<?php WindowsCommon::echo_nsi(_("Installation complete"))?>" |
|
141 | +!define FAREWELL_TEXT "<?php WindowsCommon::echo_nsi(_("Network profiles have been installed."))?>$\r$\n$\n <?php WindowsCommon::echo_nsi(_("Your system is ready."))?>" |
|
142 | +!define FAREWELL_FAIL "<?php WindowsCommon::echo_nsi(_("Network installation had errors."))?>$\r$\n$\n <?php WindowsCommon::echo_nsi(_("Please contact \${SUPPORT}."))?>" |
|
143 | 143 | ;-------------------------------- |
144 | 144 | ;Languages |
145 | 145 | !insertmacro MUI_LANGUAGE "${LANG}" |
@@ -147,14 +147,14 @@ discard block |
||
147 | 147 | ;-------------------------------- |
148 | 148 | ; License file |
149 | 149 | !ifdef LICENSE_FILE |
150 | -LicenseForceSelection checkbox "<?php WindowsCommon::echo_nsi( _("Accept"))?>" |
|
150 | +LicenseForceSelection checkbox "<?php WindowsCommon::echo_nsi(_("Accept"))?>" |
|
151 | 151 | LicenseText "<?php WindowsCommon::echo_nsi(_("If you accept the conditions then select Accept and then click Install to continue."))?>" |
152 | 152 | LicenseData ${LICENSE_FILE} |
153 | 153 | !endif |
154 | 154 | |
155 | 155 | ;----------------------------------- |
156 | 156 | |
157 | -MiscButtonText "" "" "" "<?php WindowsCommon::echo_nsi( _("Finish"))?>" |
|
157 | +MiscButtonText "" "" "" "<?php WindowsCommon::echo_nsi(_("Finish"))?>" |
|
158 | 158 | ;---------------------------------- |
159 | 159 | ; FUNCTIONS |
160 | 160 | |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | |
188 | 188 | !macro install_ca_cert ca_file ca_fingerprint level |
189 | 189 | !insertmacro debug_cat 2 "locating certificate SHA=${ca_fingerprint} Level=${level}" |
190 | - DetailPrint "<?php WindowsCommon::echo_nsi( _("searching for certificate"))?> ${ca_file}" |
|
190 | + DetailPrint "<?php WindowsCommon::echo_nsi(_("searching for certificate"))?> ${ca_file}" |
|
191 | 191 | File "${ca_file}" |
192 | 192 | nsArray::Set Delete_files "${ca_file}" |
193 | 193 | !insertmacro debug_cat 2 "Testing machine store root" |
@@ -249,13 +249,13 @@ discard block |
||
249 | 249 | ${EndIf} |
250 | 250 | !insertmacro debug_cat 2 "installing certificate $TEMP\${ca_file}" |
251 | 251 | !insertmacro debug_cat 3 "Execute: certutil -addstore -user ${level} $TEMP\${ca_file}" |
252 | - DetailPrint "<?php WindowsCommon::echo_nsi( _("installing certificate"))?> ${ca_file}" |
|
252 | + DetailPrint "<?php WindowsCommon::echo_nsi(_("installing certificate"))?> ${ca_file}" |
|
253 | 253 | nsExec::Exec '"certutil" -addstore -user ${level} "$TEMP"\${ca_file}' |
254 | 254 | Pop $0 |
255 | 255 | !insertmacro debug_cat 3 "certutil returned $0" |
256 | 256 | ${If} $0 != 0 |
257 | 257 | IfSilent +2 |
258 | - MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi( _("could not install certificate"))?> ${ca_file}" |
|
258 | + MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi(_("could not install certificate"))?> ${ca_file}" |
|
259 | 259 | !insertmacro debug_cat 1 "could not install certificate ${ca_file}" |
260 | 260 | ${EndIf} |
261 | 261 | no_install_${ca_file}: |
@@ -462,26 +462,26 @@ discard block |
||
462 | 462 | pop $R0 |
463 | 463 | ${If} $tkip_count > 0 |
464 | 464 | ${If} $aes_count > 1 |
465 | - StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echo_nsi( _("The non TKIP profiles are preferred. Always use them if you have a choice."))?>" |
|
465 | + StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echo_nsi(_("The non TKIP profiles are preferred. Always use them if you have a choice."))?>" |
|
466 | 466 | ${Else} |
467 | - StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echo_nsi( _("The non TKIP profile is preferred. Always use it if you have a choice."))?>" |
|
467 | + StrCpy $R1 "$\r$\n$\n<?php WindowsCommon::echo_nsi(_("The non TKIP profile is preferred. Always use it if you have a choice."))?>" |
|
468 | 468 | ${EndIf} |
469 | 469 | ${Else} |
470 | 470 | StrCpy $R1 "" |
471 | 471 | ${EndIf} |
472 | 472 | ${If} $profile_count > 0 |
473 | - StrCpy $welcome_message "<?php WindowsCommon::echo_nsi( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\ |
|
474 | -<?php WindowsCommon::echo_nsi( _("The installer will create the following wireless profiles:"))?>$\r$\n\ |
|
473 | + StrCpy $welcome_message "<?php WindowsCommon::echo_nsi(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\ |
|
474 | +<?php WindowsCommon::echo_nsi(_("The installer will create the following wireless profiles:"))?>$\r$\n\ |
|
475 | 475 | $R0.\ |
476 | 476 | $R1$\r$\n$\n\ |
477 | -<?php WindowsCommon::echo_nsi( _("More information and comments:"))?>$\r$\n\ |
|
477 | +<?php WindowsCommon::echo_nsi(_("More information and comments:"))?>$\r$\n\ |
|
478 | 478 | EMAIL: ${SUPPORT}$\r$\n\ |
479 | 479 | WWW: ${URL}" |
480 | 480 | ${Else} |
481 | -StrCpy $welcome_message "<?php WindowsCommon::echo_nsi( _("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\ |
|
482 | -<?php WindowsCommon::echo_nsi( _("The installer will create the wireless profile:"))?> $R0.\ |
|
481 | +StrCpy $welcome_message "<?php WindowsCommon::echo_nsi(_("This installer has been prepared for \${ORGANISATION}"))?>.$\r$\n\ |
|
482 | +<?php WindowsCommon::echo_nsi(_("The installer will create the wireless profile:"))?> $R0.\ |
|
483 | 483 | $R1$\r$\n$\n\ |
484 | -<?php WindowsCommon::echo_nsi( _("More information and comments:"))?>$\r$\n\ |
|
484 | +<?php WindowsCommon::echo_nsi(_("More information and comments:"))?>$\r$\n\ |
|
485 | 485 | EMAIL: ${SUPPORT}$\r$\n\ |
486 | 486 | WWW: ${URL}" |
487 | 487 | ${EndIf} |
@@ -507,7 +507,7 @@ discard block |
||
507 | 507 | SendMessage $HEADLINE ${WM_SETFONT} $HEADLINE_FONT 0 |
508 | 508 | ;TRANSLATION |
509 | 509 | nsDialogs::CreateControl STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 120u 46u -130u -32u "$welcome_message\ |
510 | -$\r$\n$\r$\n<?php WindowsCommon::echo_nsi( _("Installer created with software from the GEANT project."))?>" |
|
510 | +$\r$\n$\r$\n<?php WindowsCommon::echo_nsi(_("Installer created with software from the GEANT project."))?>" |
|
511 | 511 | Pop $TEXT |
512 | 512 | |
513 | 513 | SetCtlColors $DIALOG "" 0xffffff |
@@ -640,18 +640,18 @@ discard block |
||
640 | 640 | ${If} $wireless_result == 1 |
641 | 641 | !insertmacro debug_cat 1 "wlan_test.exe did not find wireless configuration service" |
642 | 642 | IfSilent +2 |
643 | - MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi( _("Windows wireless configuration service is not enabled. The installer cannot continue."))?>" |
|
643 | + MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi(_("Windows wireless configuration service is not enabled. The installer cannot continue."))?>" |
|
644 | 644 | Call Cleanup |
645 | 645 | ${EndIf} |
646 | 646 | ${If} $wireless_result == 2 |
647 | 647 | IfSilent +2 |
648 | - MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi( _("No wireless interfaces found. The installer cannot continue."))?>" |
|
648 | + MessageBox MB_OK|MB_ICONEXCLAMATION "<?php WindowsCommon::echo_nsi(_("No wireless interfaces found. The installer cannot continue."))?>" |
|
649 | 649 | Call Cleanup |
650 | 650 | ${EndIf} |
651 | 651 | ${Else} |
652 | 652 | ${If} $wireless_result > 0 |
653 | 653 | IfSilent +3 |
654 | - MessageBox MB_YESNO "<?php WindowsCommon::echo_nsi( _("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes |
|
654 | + MessageBox MB_YESNO "<?php WindowsCommon::echo_nsi(_("No wireless interfaces found. Wireless access will not be configured. Would you like to continue and configure access on the wired interface?"))?>" IDYES wired_yes |
|
655 | 655 | Call Cleanup |
656 | 656 | wired_yes: |
657 | 657 | Push 1 |
@@ -667,7 +667,7 @@ discard block |
||
667 | 667 | ${If} $wired == 1 |
668 | 668 | ${If} $force_wired == 0 |
669 | 669 | IfSilent wired |
670 | - MessageBox MB_YESNO "<?php WindowsCommon::echo_nsi( _("Do you want to enable access on wired interfaces?"))?>" IDYES wired |
|
670 | + MessageBox MB_YESNO "<?php WindowsCommon::echo_nsi(_("Do you want to enable access on wired interfaces?"))?>" IDYES wired |
|
671 | 671 | Push 0 |
672 | 672 | Pop $wired |
673 | 673 | wired: |
@@ -708,7 +708,7 @@ discard block |
||
708 | 708 | ;================================ |
709 | 709 | |
710 | 710 | Function ShowInstfiles |
711 | - !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echo_nsi( _("Profiles installation"))?>" " " |
|
711 | + !insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echo_nsi(_("Profiles installation"))?>" " " |
|
712 | 712 | FunctionEnd |
713 | 713 | ;================================ |
714 | 714 | ; Check if a wireless profile exist and put it on delete list |
@@ -727,7 +727,7 @@ discard block |
||
727 | 727 | |
728 | 728 | Function FindProfile |
729 | 729 | Pop $R8 |
730 | - DetailPrint "<?php WindowsCommon::echo_nsi( _("Checking for profile \$R8"))?>" |
|
730 | + DetailPrint "<?php WindowsCommon::echo_nsi(_("Checking for profile \$R8"))?>" |
|
731 | 731 | !insertmacro debug_cat 2 "Checking for profile $R8" |
732 | 732 | !insertmacro debug_cat 3 "Exec: $Netsh wlan show profiles $R8" |
733 | 733 | nsExec::Exec '"$Netsh" wlan show profiles "$R8"' |
@@ -735,7 +735,7 @@ discard block |
||
735 | 735 | !insertmacro debug_cat 4 "netsh returned $0" |
736 | 736 | ${If} $0 == 0 |
737 | 737 | !insertmacro debug_cat 1 "found profile $R8" |
738 | - DetailPrint "<?php WindowsCommon::echo_nsi( _("found profile \$R8"))?>" |
|
738 | + DetailPrint "<?php WindowsCommon::echo_nsi(_("found profile \$R8"))?>" |
|
739 | 739 | Push 0 |
740 | 740 | ${Else} |
741 | 741 | !insertmacro debug_cat 1 "profile $R8 not found" |
@@ -830,7 +830,7 @@ discard block |
||
830 | 830 | ${If} $Symantec_installed != 0 |
831 | 831 | !insertmacro debug_cat 3 "Symantec problem" |
832 | 832 | IfSilent +2 |
833 | - MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprint_nsi(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) ?>" |
|
833 | + MessageBox MB_OK|MB_ICONEXCLAMATION "<?php printf(WindowsCommon::sprint_nsi(_("Please READ this message it is IMPORTANT.$\\r$\\nInstallation problems may be due to the fact that Symantec Endpoint Protection is installed on your machine.$\\r$\\nWhile this is a well-known bug of the Symantec product, about which the installer can not do anything, there is a workaround.$\\r$\\nWhen you close this window the installer will exit and an explorer window will be started (it could appear underneath already opened windows). In this window you should see a script named inst_cat. Start it by double-clicking, It will install the profiles. You will need to login to %s with your username and password.")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name']) ?>" |
|
834 | 834 | Exec '"explorer" /select,"$EXEDIR\inst_cat.cmd"' |
835 | 835 | Quit |
836 | 836 | |
@@ -1121,7 +1121,7 @@ discard block |
||
1121 | 1121 | Function PFXCertificateSelect |
1122 | 1122 | !ifndef SILVERBULLET |
1123 | 1123 | ;TRANSLATION |
1124 | -!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprint_nsi(_("%s installer for")),CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])?> " "<?php WindowsCommon::echo_nsi(_("Install personal certificate"))?>" |
|
1124 | +!insertmacro MUI_HEADER_TEXT "<?php printf(WindowsCommon::sprint_nsi(_("%s installer for")), CONFIG_CONFASSISTANT['CONSORTIUM']['display_name'])?> " "<?php WindowsCommon::echo_nsi(_("Install personal certificate"))?>" |
|
1125 | 1125 | ;TRANSLATION |
1126 | 1126 | IfSilent +2 |
1127 | 1127 | MessageBox MB_OK "<?php WindowsCommon::echo_nsi(_("Preparing to install personal certificate."))?>$\r$\n<?php WindowsCommon::echo_nsi(_("Click OK to continue"))?> " |
@@ -1137,7 +1137,7 @@ discard block |
||
1137 | 1137 | $certPasswordLength = strlen($certPasswordLabel); |
1138 | 1138 | $certUsernameLabel = WindowsCommon::sprint_nsi(_("Username:")); |
1139 | 1139 | $certUsernameLength = strlen($certUsernameLabel); |
1140 | - $labelLength = max($certPasswordLength,$certUsernameLength); |
|
1140 | + $labelLength = max($certPasswordLength, $certUsernameLength); |
|
1141 | 1141 | ?> |
1142 | 1142 | ${NSD_CreateLabel} 0 0 100% 32u "<?php WindowsCommon::echo_nsi(_("Selected file: \$Cert_file"))?>" |
1143 | 1143 | !else |
@@ -1154,11 +1154,11 @@ discard block |
||
1154 | 1154 | !insertmacro debug_cat 3 "Vista level (Vista without Service pack): $VistaNoSP"; |
1155 | 1155 | ${If} $VistaNoSP == 0 |
1156 | 1156 | !ifdef PFX_USERNAME |
1157 | - !define LABEL_LENGTH "<?php echo($labelLength*3.5)?>u" |
|
1158 | - !define TEXT_START "<?php echo($labelLength*3.5 +5)?>u" |
|
1157 | + !define LABEL_LENGTH "<?php echo($labelLength * 3.5)?>u" |
|
1158 | + !define TEXT_START "<?php echo($labelLength * 3.5 + 5)?>u" |
|
1159 | 1159 | !else |
1160 | - !define LABEL_LENGTH "<?php echo($certPasswordLength*3.5)?>u" |
|
1161 | - !define TEXT_START "<?php echo($certPasswordLength*3.5 +5)?>u" |
|
1160 | + !define LABEL_LENGTH "<?php echo($certPasswordLength * 3.5)?>u" |
|
1161 | + !define TEXT_START "<?php echo($certPasswordLength * 3.5 + 5)?>u" |
|
1162 | 1162 | !endif |
1163 | 1163 | ${NSD_CreateLabel} 0 35u ${LABEL_LENGTH} 12u "<?php echo $certPasswordLabel?>" |
1164 | 1164 | ${NSD_CreatePassword} ${TEXT_START} 34.5u 120u 12u "" |
@@ -1530,7 +1530,7 @@ discard block |
||
1530 | 1530 | Section "-start" |
1531 | 1531 | SectionIn RO |
1532 | 1532 | |
1533 | -!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echo_nsi( _("Installation"))?>" "<?php WindowsCommon::echo_nsi( _("Checking for existing wireless profiles"))?>" |
|
1533 | +!insertmacro MUI_HEADER_TEXT "<?php WindowsCommon::echo_nsi(_("Installation"))?>" "<?php WindowsCommon::echo_nsi(_("Checking for existing wireless profiles"))?>" |
|
1534 | 1534 | !ifndef PWD |
1535 | 1535 | !include "certs.nsh" |
1536 | 1536 | !endif |