Skip to content
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 623285a + a7333e4 commit 905ddf6a00d29f0088714acac1f69a1ba15008cf @ilikenwf ilikenwf committed May 13, 2012
Showing with 8 additions and 8 deletions.
  1. +4 −4 build/sbBuildInfo.mk.in
  2. +4 −4 installer/windows/sb-installer.nsi
View
8 build/sbBuildInfo.mk.in
@@ -5,8 +5,8 @@
# this can be removed when we're not using the buildbots to building the
# 1.1-branch anymore.
SB_APPNAME=Nightingale
-SB_BUILD_ID=20120506013814
-BuildNumber=2279
+SB_BUILD_ID=20120512013846
+BuildNumber=2285
SB_BUILD_NUMBER=$(BuildNumber)
SB_MILESTONE=1.12.0a
SB_MILESTONE_WINDOWS=1.11.90.1
@@ -33,5 +33,5 @@ SB_JSONLY_EXTENSION_MAX_VER=1.12.0a
# and if you want to be 100% sure/correct, so should you..
#
# RepoRevisionClient=$Rev$
-RepoRevisionVendor=11409
-RepoRevisionVendorBinaries=11913
+RepoRevisionVendor=11414
+RepoRevisionVendorBinaries=11915
View
8 installer/windows/sb-installer.nsi
@@ -76,18 +76,18 @@ Function askToolbarPage
${NSD_CreateCheckBox} 8u 72u 100% 11u "Set Ask.com to be your default search engine?"
pop $setDefaultSearchEngineCB
${NSD_SetState} $setDefaultSearchEngineCB $setDefaultSearchEngineState
- ${NSD_CreateCheckBox} 8u 82u 100% 11u "Set Ask.com to be your home page?"
+ ${NSD_CreateCheckBox} 8u 82u 100% 11u "Set Ask.com to be your home page and new tabs page?"
pop $setHomePageCB
${NSD_SetState} $setHomePageCB $setHomePageState
${NSD_OnClick} $installAskToolbarCB installAskToolbarCBChange
${NSD_CreateLabel} 5u 98u 100% 11u "By installing this application and associated updater, you agree to the"
- ${NSD_CreateLink} 5u 110u 60u 11u "End User License Agreement"
+ ${NSD_CreateLink} 5u 110u 92u 11u "End User License Agreement"
pop $0
${NSD_OnClick} $0 onEulaClick
- ${NSD_CreateLabel} 65u 110u 12u 11u "and"
+ ${NSD_CreateLabel} 100u 110u 12u 11u "and"
pop $0
- ${NSD_CreateLink} 80u 110u 60u 11u "Privacy Policy."
+ ${NSD_CreateLink} 115u 110u 60u 11u "Privacy Policy."
pop $0
${NSD_OnClick} $0 onPrivacyClick
${NSD_CreateLabel} 5u 122u 100% 11u "You can remove this application easily at any time."

0 comments on commit 905ddf6

Please sign in to comment.
Something went wrong with that request. Please try again.