modify/delete wordbook files for good

* extras/source/wordbook/lang/*/soffice.dic: deleted
  These files were in old binary format and almost all
  language files were replicas of the en-US file. There
  were two exceptions: German and Slovenian. André Schnabel
  checked the German word list and he said that they can be
  deleted. Martin Srebotnjak checked the Slovenian word list
  and he asked me to keep those words -> sl.dic
* extras/source/wordbook/oracle.dic: deleted
  It was not used in the build. It contained Oracle brand
  names, etc.
* extras/source/wordbook/standard.dic: deleted
  It was built and delivered, but not packaged. It was an
  empty dictionary file which would be created anyway when
  the user creates a new empty dictionary.
* extras/source/wordbook/technical.dic:
  Entries were sorted so it will be easier to add new words.
  Some entries were added from lang/en-US/soffice.dic.
* extras/source/wordbook/sl.dic: added Slovenian words
* extras/source/wordbook/en-US.dic: added English words
* extras/source/wordbook/en-GB.dic: added English words
* scp2/source/ooo/ :
  These wordbook files should not depend on the UI language.
  They should not be in language packs but they all should
  be installed for every language like spell checker
  dictionaries.
* officecfg/registry/ :
  Paths adjusted, so application looks for wordbook files
  in the right directory.
  I enabled all dictionaries by default in Linguistic.xcs.

31 files changed, 243 insertions, 811 deletions

diff --git a/extras/prj/build.lst b/extras/prj/build.lst
index 85fdd3161c74..3aca64666f3a 100644
--- a/extras/prj/build.lst
+++ b/extras/prj/build.lst
@@ -81,5 +81,4 @@ er      extras\source\templates\wizard\letter\lang              nmake   -
 er      extras\source\templates\wizard\report\lang              nmake   -       all     er_twrel NULL
 er      extras\source\templates\wizard\styles\lang              nmake   -       all     er_stls NULL
 er	extras\source\wordbook					nmake	-	all	er_wrdb NULL
-er	extras\source\wordbook\lang				nmake	-	all	er_wrdbl NULL
 er	extras\unx\source\bitmaps				nmake	-	all	er_bmpu NULL
diff --git a/extras/prj/d.lst b/extras/prj/d.lst
index d1a176c70ff7..942ce71ea157 100644
--- a/extras/prj/d.lst
+++ b/extras/prj/d.lst
@@ -4,10 +4,6 @@ mkdir: %COMMON_DEST%\pck%_EXT%\openoffice
 
 ..\%COMMON_OUTDIR%\bin\*.zip %COMMON_DEST%\pck%_EXT%\*.zip
 ..\source\extensions\*.oxt %COMMON_DEST%\bin%_EXT%\*.oxt
-..\%COMMON_OUTDIR%\bin\wordbook_en-US.zip %COMMON_DEST%\pck%_EXT%\wordbook_ja.zip
-..\%COMMON_OUTDIR%\bin\wordbook_en-US.zip %COMMON_DEST%\pck%_EXT%\wordbook_ko.zip
-..\%COMMON_OUTDIR%\bin\wordbook_en-US.zip %COMMON_DEST%\pck%_EXT%\wordbook_zh-CN.zip
-..\%COMMON_OUTDIR%\bin\wordbook_en-US.zip %COMMON_DEST%\pck%_EXT%\wordbook_zh-TW.zip
 ..\source\truetype\symbol\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
 ..\source\truetype\symbol\*.otf %COMMON_DEST%\pck%_EXT%\*.otf
 ..\source\truetype\decorative\*.ttf %COMMON_DEST%\pck%_EXT%\*.ttf
diff --git a/extras/source/wordbook/en-GB.dic b/extras/source/wordbook/en-GB.dic
new file mode 100644
index 000000000000..6f5945371014
--- /dev/null
+++ b/extras/source/wordbook/en-GB.dic
@@ -0,0 +1,46 @@
+OOoUserDict1
+lang: en-GB
+type: positive
+---
+Applet
+Applets
+AutoAbstract
+AutoComplete
+AutoFill
+AutoMail
+AutoPilots
+AutoSpell
+AutoUpdate
+Bitmap
+Clientsided
+ClipArt
+ClipArts
+Combobox
+Euro
+FontManager
+Fontwork
+Frameset
+Framesets
+GIFs
+HelpAgent
+HighEnd
+Homepage
+Http
+Hyperlink
+Hyperlinks
+ImageMaps
+Imagemap
+Intranet
+PlugIns
+Plugin
+PreFinal
+Serversided
+ServicePack
+TabPage
+deinstall
+deinstalled
+deinstalling
+deinstalls
+userspace
+endian
+endianness
diff --git a/extras/source/wordbook/en-US.dic b/extras/source/wordbook/en-US.dic
new file mode 100644
index 000000000000..4aa77f9c9665
--- /dev/null
+++ b/extras/source/wordbook/en-US.dic
@@ -0,0 +1,46 @@
+OOoUserDict1
+lang: en-US
+type: positive
+---
+Applet
+Applets
+AutoAbstract
+AutoComplete
+AutoFill
+AutoMail
+AutoPilots
+AutoSpell
+AutoUpdate
+Bitmap
+Clientsided
+ClipArt
+ClipArts
+Combobox
+Euro
+FontManager
+Fontwork
+Frameset
+Framesets
+GIFs
+HelpAgent
+HighEnd
+Homepage
+Http
+Hyperlink
+Hyperlinks
+ImageMaps
+Imagemap
+Intranet
+PlugIns
+Plugin
+PreFinal
+Serversided
+ServicePack
+TabPage
+deinstall
+deinstalled
+deinstalling
+deinstalls
+userspace
+endian
+endianness
diff --git a/extras/source/wordbook/lang/bg/soffice.dic b/extras/source/wordbook/lang/bg/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/bg/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/cs/soffice.dic b/extras/source/wordbook/lang/cs/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/cs/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/da/soffice.dic b/extras/source/wordbook/lang/da/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/da/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/de/soffice.dic b/extras/source/wordbook/lang/de/soffice.dic
deleted file mode 100644
index cd36efc3298d..000000000000
--- a/extras/source/wordbook/lang/de/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/delzip b/extras/source/wordbook/lang/delzip
deleted file mode 100644
index 636fda90bfcb..000000000000
--- a/extras/source/wordbook/lang/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/extras/source/wordbook/lang/en-GB/soffice.dic b/extras/source/wordbook/lang/en-GB/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/en-GB/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/en-US/soffice.dic b/extras/source/wordbook/lang/en-US/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/en-US/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/es/soffice.dic b/extras/source/wordbook/lang/es/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/es/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/eu/soffice.dic b/extras/source/wordbook/lang/eu/soffice.dic
deleted file mode 100755
index 87d380006dcd..000000000000
--- a/extras/source/wordbook/lang/eu/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/fr/soffice.dic b/extras/source/wordbook/lang/fr/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/fr/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/hu/soffice.dic b/extras/source/wordbook/lang/hu/soffice.dic
deleted file mode 100755
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/hu/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/it/soffice.dic b/extras/source/wordbook/lang/it/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/it/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/makefile.mk b/extras/source/wordbook/lang/makefile.mk
deleted file mode 100644
index 2e031105e78f..000000000000
--- a/extras/source/wordbook/lang/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..$/..$/..
-
-
-
-PRJNAME=extras
-TARGET=wordbook
-
-.INCLUDE : settings.mk
-
-.INCLUDE : $(PRJ)$/util$/target.pmk
-
-
-
-ZIP1TARGET      = $(WORDBOOK_ALL_TARGET)
-
-ZIP1LIST	= $(LANGDIR)$/*
-
-
-
-.INCLUDE : target.mk
-
diff --git a/extras/source/wordbook/lang/nl/soffice.dic b/extras/source/wordbook/lang/nl/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/nl/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/pl/soffice.dic b/extras/source/wordbook/lang/pl/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/pl/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/pt-BR/soffice.dic b/extras/source/wordbook/lang/pt-BR/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/pt-BR/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/pt/soffice.dic b/extras/source/wordbook/lang/pt/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/pt/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/ru/soffice.dic b/extras/source/wordbook/lang/ru/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/ru/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/sk/soffice.dic b/extras/source/wordbook/lang/sk/soffice.dic
deleted file mode 100644
index 5551095d3662..000000000000
--- a/extras/source/wordbook/lang/sk/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/sl/soffice.dic b/extras/source/wordbook/lang/sl/soffice.dic
deleted file mode 100644
index b1525a7a9451..000000000000
--- a/extras/source/wordbook/lang/sl/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/lang/sv/soffice.dic b/extras/source/wordbook/lang/sv/soffice.dic
deleted file mode 100644
index b7e9b330a913..000000000000
--- a/extras/source/wordbook/lang/sv/soffice.dic
+++ /dev/null
diff --git a/extras/source/wordbook/makefile.mk b/extras/source/wordbook/makefile.mk
index d65e627bab3d..f5490bf336e4 100644
--- a/extras/source/wordbook/makefile.mk
+++ b/extras/source/wordbook/makefile.mk
@@ -25,9 +25,6 @@
 #
 #*************************************************************************
 PRJ=..$/..
-
-
-
 PRJNAME=extras
 TARGET=wordbookall
 
@@ -35,23 +32,11 @@ TARGET=wordbookall
 
 .INCLUDE : $(PRJ)$/util$/target.pmk
 
-
-
 ZIP1TARGET      = $(WORDBOOK_ALL_TARGET)
 
-ZIP1LIST        = technical.dic
-
-
-ZIP2TARGET      = $(WORDBOOK_USER_TARGET)
-
-ZIP2LIST        = standard.dic
-
-
-
+ZIP1LIST        = technical.dic \
+                  sl.dic \
+                  en-US.dic \
+                  en-GB.dic
 
 .INCLUDE : target.mk
-
-
-
-
-
diff --git a/extras/source/wordbook/oracle.dic b/extras/source/wordbook/oracle.dic
deleted file mode 100644
index 5b7ab0957916..000000000000
--- a/extras/source/wordbook/oracle.dic
+++ /dev/null
@@ -1,626 +0,0 @@
-OOoUserDict1
-lang: <none>
-type: positive
----
-Accelerator
-Access
-Accessibility
-Account
-Accounting
-Accounts
-Acorde=
-Activity
-Adapter
-Adapters
-Add-in
-Add-on
-Add-On
-Administration
-Administrator
-Admissions
-Advanced
-Advantage
-Advisor
-Agent
-Agents
-Agile
-Analysis
-Analytics
-Analyzer
-AppConnect=
-Application
-Applications
-AppWizard=
-AppXaminer=
-AppXNavigator=
-AppXRay=
-Architecture
-Argus=
-Asset
-Assets
-Assistant
-Automation
-Automotive
-AutoVue=
-Backbone
-Banking
-Base
-Base24=
-Based
-Basel=
-Beehive=
-Berkeley
-Bill
-Billing
-Bills
-Blade
-BookBuilder=
-Brocade=
-Budgeting
-Budgets
-Builder
-Bulk
-Bus
-Business
-CADView=
-Calc=
-Call
-Campaigns
-Campus
-Candidate
-Capital
-Captovation=
-Capture
-Care
-Cartridge
-Case
-Cash
-Center
-Certified
-Chain
-Change
-ChangeCast=
-Channel
-Cisco=
-Clickstream=
-Client
-Clinical
-Cluster
-Clusters
-Cognos=
-Coherence
-Collaboration
-Collaborative
-Collection
-Collections
-Commerce
-Commercial
-Communications
-Compensation
-Compliance
-Component
-Components
-Configuration
-Configurator
-Connect2OracleSelf=
-Connection
-Connector
-Console
-Consulting
-Consumer
-Contact
-Content
-ConText=
-Contract
-Contracts
-Control
-Controls
-Core
-COREid=
-Corporate
-Corporation=
-Costing
-Credit
-Crypto
-Crystal
-Custom
-Customer
-Customers
-Dashboard
-Dashboards
-Data
-Database
-Datacenter=
-Daybreak
-Delivery
-Demand
-Demantra=
-Designer
-Desktop
-Developer
-Development
-Device
-Direct
-Director
-Directory
-Discoverer
-Discrete
-Distribution
-DistributionRPM=
-DocLink=
-Docuflex=
-Documaker=
-Document
-Documentum=
-Draw=
-Dynamic
-E-Business=
-e-Commerce
-E-Delivery
-E-Factoring
-E-Mail
-E-Records
-e-Support
-Easy*SQL=
-eAutomotive=
-eBenefits=
-eBill=
-eBilling=
-eCommunications=
-eCompensation=
-eConfigurator=
-eConsumer=
-eCustomer=
-eDevelopment=
-Edition
-Education
-Edwards
-eEnergy=
-eEvents=
-eFinance=
-eHealthcare=
-eInsurance=
-Electro-Mechanical
-Ellison=
-Email
-eMail
-eMedia=
-Encyclopedia
-Energy
-Engine
-Enterprise
-EnterpriseOne=
-eOil=
-ePay=
-ePayment=
-ePerformance=
-eProcurement=
-eProfile=
-ePublic=
-eRecruit=
-eRetail=
-eSales=
-eService=
-eSettlements=
-Essbase=
-Estate
-eStatement=
-eSupplier=
-Ethernet
-eTransportation=
-eTravel=
-Exadata=
-Exchange
-Execution
-Expansion
-Express
-ExpressModule=
-Extension
-Extensions
-FastForward=
-Field
-FieldService=
-FileAct=
-Filenet=
-Finance
-Financial
-Financials
-FinancialsRPM=
-Fire=
-Flash=
-FlashFire=
-Floor
-Flow
-Foundation
-Framework
-Fulfillment
-Funds
-Fusion
-Gateway
-General
-Gigabit
-GigaSwift=
-Global
-GoldenGate=
-Goods
-Government
-Gradebook=
-Grants
-Group
-Handheld
-Healthcare
-HelpDesk=
-High
-Hub
-Human
-Hummingbird=
-Hyperion=
-i-flex
-iAssets=
-iClaims=
-iDelivery=
-Identity
-iGovernment=
-iLearning=
-iMarketing=
-iMeeting=
-Impress=
-Incentive
-Industry
-InfiniBand=
-Information
-Informix=
-Infosync=
-Infrastructure
-Insight
-Institutional
-Insurance
-Integration
-Integrator
-Intellectual
-Intelligence
-InterAct=
-Interaction
-Interactive
-InterConnect=
-InterDev=
-Interface
-interMedia=
-Inventory
-iPayment=
-iPLS=
-iProcurement=
-iReceivables=
-iRecruitment=
-iSetup=
-iSQL*Plus=
-iStore=
-IStream=
-iSupplier=
-iSupport=
-iWay=
-Java=
-JDeveloper=
-JeOS
-JHeadstart=
-Jinitiator=
-Jolt=
-JRockit=
-JServer=
-Kit
-Kodo=
-Labor
-Larry=
-Learning
-Lease
-Leasing
-Ledger
-Legal
-Lending
-Library
-Life
-Lifecycle
-Lines
-Linux
-Livelink=
-Load
-Loans
-LogMiner=
-Loyalty
-Machine
-Mainframe
-Maintenance
-Managed
-Management
-management
-Manager
-Managers
-Mantas=
-Manufacturing
-Marketing
-Mart
-Marts
-Master
-Math=
-MatrixOne=
-Media
-Medical
-MessageQ=
-Messaging
-Metadata
-MetaSolv=
-Microsoft=
-MicroStrategy=
-Middleware
-Migration
-Mobile
-Model
-Modeling
-Module
-Modules
-Monitor
-Monitoring
-Multi-Currency
-Multi-Site
-Multichannel
-MultiChannel=
-MultiDB=
-Multilayer
-Multinational
-Multiprotocol
-MultiProtocol=
-Multiservice
-Multisite
-Multithreaded
-NetApp=
-Netra=
-NetSolutions=
-Network
-Nostro=
-Objectel=
-Objects
-Office=
-On
-OnDemand=
-One
-Online
-OnLine=
-Onsite
-Open=
-OpenBeleid=
-OpenDocument=
-OpenOffice.org=
-OpenText=
-OpenWorld=
-OpenZorg=
-Operational
-Operations
-Optimization
-Option
-Oracle=
-OracleBRONZE=
-OracleCONTACT=
-OracleDevConnect=
-OracleGOLD=
-OracleIncident=
-OracleJSP0
-OracleLifeCycle=
-OracleMERCURY=
-OracleMetaLink=
-Oraclemetals=
-OraclePLATINUM=
-OracleSILVER=
-OracleSTERLING=
-Order
-Origination
-Outage
-Pack
-Parkway=
-Partner
-PartnerNetwork=
-Payable
-Payables
-Payment
-Payments
-Payroll
-PayrollRPM=
-PeopleBooks=
-PeopleCode=
-PeopleSoft=
-Peoplesoft=
-PeopleTools=
-Performance
-Personal
-Phaos=
-Pharma
-Planning
-Platform
-Plug-in
-Plug-In
-Plug-ins
-Plus
-Point
-Policies
-Policy
-Port
-Portal
-PortalRPM=
-Pricing
-Primavera=
-PrimeSourcing=
-Process
-ProcessConnect=
-Processing
-Processor
-Procurement
-Product
-product
-Production
-Productivity
-Professional
-Profiles
-Profitability
-Project
-ProjectsRPM=
-Promotions
-Property
-Provider
-Provisioning
-Public
-Publisher
-Purchasing
-Quality
-Quickclip=
-Quoting
-Rack
-Rally
-Rating
-Real
-Real
-Real-Time
-Receivables
-Records
-Recruiting
-Redwood=
-Reference
-Relationship
-Repair
-Reporting
-Reports
-Repository
-Resource
-Resources
-ResourcesRPM=
-Retail
-Reveleus=
-Revenue
-Risk
-RosettaNet=
-Rules
-Sale
-Sales
-Samples
-Satmetrix=
-Scheduler
-Scheduling
-Sciences
-Scorecard
-Search
-Sector
-Secure
-SecureCARE=
-Security
-Self
-SellingPoint=
-Server
-Service
-Services
-Servicing
-Shores=
-Siebel=
-Sign-On
-SimBuilder=
-Single
-Site
-SiteMinder=
-SkillsVillage=
-Smart
-SmartScript=
-SmartViews=
-Software
-Solution
-Solutions
-Sophoi=
-Sourcing
-Space
-Spatial=
-SSLava=
-Standard
-Steward
-Storage
-StorageTek=
-Store
-Strategic
-Student
-Studio
-StyleBox=
-Subledger
-Succession
-Suite
-Sun=
-SunHSI=
-SunSAI=
-Superior
-Supervisor
-Supply
-Support
-SupportInsite=
-SupportNews=
-SupportNotes=
-SureTrak=
-SWIFTNet=
-Switch
-Switching
-System
-Talent
-Taxation
-Tech
-Technology
-Telco=
-Telecom
-Telemarketing
-Telephony
-TeleSales=
-TeleService=
-Testing
-Theory
-Time
-TimesTen=
-Tools
-TopLink=
-TopPlan=
-Tracking
-Trade
-Trading
-Transaction
-Transfer
-Transparent
-Transportation
-Treasury
-Trial
-TrialMinder=
-Tuxedo=
-Unbreakable=
-Unified
-Universal
-Update
-Upgrade
-User
-Utilities
-Utility
-Value
-Vault
-Veridata
-Virtual
-VoIP=
-VueLink=
-Warehouse
-Web
-WebCast=
-WebCenter=
-WebDB=
-WebHouse=
-WebLogic=
-Webmail
-WebServer=
-WebTrack=
-Whitehill=
-Wireless
-Work
-Workflow
-Workforce
-Workgroup
-Workspace
-Workspaces
-World
-Writer=
diff --git a/extras/source/wordbook/sl.dic b/extras/source/wordbook/sl.dic
new file mode 100644
index 000000000000..4c2100a99a2f
--- /dev/null
+++ b/extras/source/wordbook/sl.dic
@@ -0,0 +1,24 @@
+OOoUserDict1
+lang: sl
+type: positive
+---
+avtopiloti
+hiperpovezav
+hiperpovezava
+hiperpovezavam
+hiperpovezavama
+hiperpovezavami
+hiperpovezave
+hiperpovezavi
+hiperpovezavo
+intranet
+samooblikovanj
+samooblikovanja
+samooblikovanje
+samooblikovanju
+samopopravka
+samopopravki
+samopopravkom
+samopopravkoma
+samopopravkov
+samopopravku
diff --git a/extras/source/wordbook/standard.dic b/extras/source/wordbook/standard.dic
deleted file mode 100644
index 5b8b235b5dd0..000000000000
--- a/extras/source/wordbook/standard.dic
+++ /dev/null
@@ -1,4 +0,0 @@
-OOoUserDict1

-lang: <none>

-type: positive

----
\ No newline at end of file
diff --git a/extras/source/wordbook/technical.dic b/extras/source/wordbook/technical.dic
index b79e217ecfb1..383c6689c390 100644
--- a/extras/source/wordbook/technical.dic
+++ b/extras/source/wordbook/technical.dic
@@ -2,159 +2,157 @@ OOoUserDict1
 lang: <none>
 type: positive
 ---
-LibreOffice=
-OpenOffice.org=
-OpenDocument=
-AppArmor
-BorderManager
-Carefx
-ConsoleOne
-GroupWise
-ManageWise
-MySQL
-NRadius
-NetIdentity
-NetMail
-NetStorage
-NetWare
-Novell
-OnDemand
-PolyServe
-SecretStore
-SecureLogin
-WorkPlace
-XTier
-Xtensible
-ZENworks
-eDirectory
-eGuide
-iChain
-iFolder
-iManager
-iPrint
-Ximian
-SLES
-SLED
-SUSE
-openSUSE
-Debian
-SPI
-woody
-sarge
-etch
-lenny
-squeeze
-wheezy
-sid
-Badger
-Breezy
-Canonical
-Dapper
-Drake
-Edgy
-Edubuntu
-Eft
-Fawn
-Feisty
-Gibbon
-Gutsy
-Hardy
-Hedgehog
-Heron
-Hoary
-Ibex
-Intrepid
-Jackalope
-Jaunty
-Karmic
-Koala
-Kubuntu
-Launchpad
-Lucid
-Lynx
-Malone
-Maverick
-Meerkat
-Rosetta
-Soyuz
-Ubuntu
-Warthog
-Warty
-Xubuntu
-Acrobat
-Acer
 Accenture
+Acer
+Acrobat
 Add-in
 Adobe
 Advanced
 AMD
 Android
+AppArmor
 AppConnect=
+Apple
 AppWizard=
 AppXaminer=
 AppXNavigator=
 AppXRay=
-Apple
-Asus
 Argus=
+Asus
 AutoVue=
+Badger
 Base=
 Base24=
 Bing
+BorderManager
+Breezy
 CADView=
-Canon
 Calc=
+Canon
+Canonical
 Capgemini
-Cisco=
+Carefx
 Chrome
+Cisco=
 Clickstream=
 Cognos=
 Connect2OracleSelf=
+ConsoleOne
 ConText=
 COREid=
 Corporation
+Dapper
+dBase
+Debian
+debootstrap
 Dell
 Devices
 DocLink
 Docuflex=
 Documaker=
 Document
+dpkg
+Drake
 Draw=
+Edgy
+eDirectory
+Edubuntu
+Eft
+eGuide
 Electronics
+Etch
 Ethernet
 Evolution
 Exadata=
 Facebook
+Fawn
+Feisty
 Firebird
 Firefox
+FLAC
+Flash
 Foundation
 Foxconn
+FreeBSD
 Fujitsu
+gcc
+gcj
+Gibbon
+GIF
+gij
 GNOME
 GNU
 Google
+GPS
+GroupWise
+Gutsy
+Hardy
+Hedgehog
+Heron
 Hewlett-Packard
 Hi-Fi
 Hitachi
+Hoary
 HP
+HTML
+Ibex
 IBM
+iChain
 Identi.ca
+iFolder
+iManager
 Impress=
 Intel
+Intrepid
+iPrint
+Jackalope
+Jaunty
+JavaScript
+JPEG
+Karmic
 KDE
+Kerberos
+Koala
+Kubuntu
+Launchpad
 LDAP
+Lenny
 Lenovo
+LibreOffice=
 Linux
+Lucid
+Lynx
+Malone
+ManageWise
 MasterCard
 Math=
+Maverick
+Meerkat
 Micro
 Microsoft=
 MicroStrategy=
 Mono
 Motorola
 Mozilla
+MySQL
+NCSA
 NEC
+NetBSD
+NetIdentity
+NetMail
+NetStorage
+NetWare
+NNTP
 Nokia
+Novell
+NRadius
+ODBC
+Ogg
+OnDemand
+OpenBSD
+OpenDocument=
+OpenOffice.org=
+openSUSE
 OpenText=
 OpenWorld=
 OpenZorg=
@@ -165,51 +163,68 @@ Panasonic
 PayPal
 PeopleSoft=
 Plug-in
+PNG
+PolyServe
+POP3
 PostgreSQL
 PPPoE
 Quanta
+Rosetta
 RosettaNet=
+rpm
 Samba
 Samsung
 SAP
+Sarge
 Satmetrix=
+SecretStore
+SecureLogin
 Sharp
+Shockwave
+Sid
 Skype
+SLED
+SLES
+SMTP
 Sony
+Soyuz
+Spamassassin
+SPI
+Squeeze
+StarOffice
 StorageTek=
 Sun=
 SunHSI=
 SunSAI=
-The
+SUSE
 TeliaSonera
+The
 Thunderbird
 Toshiba
+TrueType
 Twitter
-VoIP=
+Ubuntu
+uname
+URL
 Visa
+VoIP=
+Vorbis
+VRML
+Warthog
+Warty
+Wheezy
 Wi-Fi
 WiMAX
 Windows
+Woody
+WorkPlace
 Writer=
+WYSIWYG
+Xen
+Ximian
+Xtensible
+XTier
+Xubuntu
 Yahoo
 YouTube
-endian
-endianness
-Kerberos
-debootstrap
-userspace
-FreeBSD
-OpenBSD
-NetBSD
-dpkg
-rpm
-gcc
-gcj
-gij
-GPS
-spamassassin
-Xen
-uname
-Ogg
-Vorbis
-FLAC
+ZENworks
diff --git a/extras/util/target.pmk b/extras/util/target.pmk
index 95f7fe740a3a..4491247a9376 100644
--- a/extras/util/target.pmk
+++ b/extras/util/target.pmk
@@ -186,11 +186,10 @@ TEMPLATE_WIZARD_HOMEPAGE_TARGET = tplwizhomepage
 TEMPLATE_WIZARD_LETTER_TARGET   = tplwizletter
 TEMPLATE_WIZARD_REPORT_TARGET   = tplwizreport
 TEMPLATE_WIZARD_STYLES_TARGET   = tplwizstyles
-TEMPLATE_WIZARD_WEB_TARGET		= tplwizweb
+TEMPLATE_WIZARD_WEB_TARGET      = tplwizweb
 
 
 WORDBOOK_ALL_TARGET             = wordbook
-WORDBOOK_USER_TARGET            = wordbookuser
 
 FONTS_WIN_ARIOSO_BOLD           = fontwinariosobold
 FONTS_WIN_ARIOSO_NORMAL         = fontwinariosonormal