diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-06-22 11:00:07 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-06-22 11:00:07 +0200 |
| commit | 674db242c037020626050c8de06367808d94eaaa (patch) | |
| tree | e8d6cb7dda0be01a9aaae88bccd6dca7985859b2 /instsetoo_native | |
| parent | 113866583c5a34b9242aeb9040c4ce80e65da1ba (diff) | |
fdo#80332 remove "Support assistive technology tools" checkbox from installer
Revert "fdo#39833 add "Support assistive technology tools" option to Windows installer"
This reverts commit 98fd8f345504e98e9ed16f4845d55f5b88b77a5e.
Conflicts:
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
Change-Id: I04cafd063bd06db37eadd13b58f7b7adfad2ca42
Diffstat (limited to 'instsetoo_native')
3 files changed, 2 insertions, 7 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index f2b6917dce8c..f4293a542b44 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -682,8 +682,5 @@ en-US = "No applications have been selected for installation. Click OK, then sel [OOO_CONTROL_319] en-US = "Create a start link on desktop" -[OOO_CONTROL_320] -en-US = "Support assistive technology tools" - [OOO_CONTROL_321] en-US = "Load [ProductName] during system start-up" diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt index 85d191a05d44..08463f4168dc 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt @@ -2,5 +2,4 @@ Property Value s72 S64 CheckBox Property CREATEDESKTOPLINK 1 -ENABLEATTOOLS 1 QUICKSTART 1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt index a9fc6d22c616..64ab81845876 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt @@ -195,7 +195,7 @@ PatchWelcome TextLine2 Text 135 54 228 45 65539 OOO_CONTROL_162 ReadyToInstall Back PushButton 164 243 66 17 3 OOO_CONTROL_163 InstallNow ReadyToInstall Banner Bitmap 0 0 374 44 1 BannerBmp ReadyToInstall BannerLine Line 0 44 374 0 1 -ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 DesktopLink +ReadyToInstall Cancel PushButton 301 243 66 17 3 OOO_CONTROL_166 Back ReadyToInstall DlgDesc Text 21 23 272 25 65539 OOO_CONTROL_167 ReadyToInstall DlgLine Line 0 234 374 0 1 ReadyToInstall DlgText Text 21 51 326 20 3 OOO_CONTROL_168 @@ -205,8 +205,7 @@ ReadyToInstall DlgTitle2 Text 13 6 280 25 65538 OOO_CONTROL_171 ReadyToInstall DlgTitle3 Text 13 6 280 25 65538 OOO_CONTROL_172 ReadyToInstall InstallNow PushButton 230 243 66 17 3 OOO_CONTROL_173 Cancel ReadyToInstall DesktopLink CheckBox 21 100 300 10 3 CREATEDESKTOPLINK OOO_CONTROL_319 EnableATTools -ReadyToInstall EnableATTools CheckBox 21 125 300 10 3 ENABLEATTOOLS OOO_CONTROL_320 EnableQuickstart -ReadyToInstall EnableQuickstart CheckBox 21 150 300 10 3 QUICKSTART OOO_CONTROL_321 Back +ReadyToInstall EnableQuickstart CheckBox 21 125 300 10 3 QUICKSTART OOO_CONTROL_321 Back ReadyToRemove Back PushButton 164 243 66 17 3 OOO_CONTROL_174 RemoveNow ReadyToRemove Banner Bitmap 0 0 374 44 1 BannerBmp ReadyToRemove BannerLine Line 0 44 374 0 1 |