Merge remote branch 'origin/libreoffice-3-3'

4 files changed, 246 insertions, 37 deletions

diff --git a/extras/source/palettes/libreoffice.soc b/extras/source/palettes/libreoffice.soc
index 792dfebd7688..e2473a8147cd 100644
--- a/extras/source/palettes/libreoffice.soc
+++ b/extras/source/palettes/libreoffice.soc
@@ -5,24 +5,34 @@
 <draw:color draw:name="White" draw:color="#ffffff" />
 <!-- LibreOffice colors -->
 <!-- http://wiki.documentfoundation.org/Marketing/Branding#Colors -->
-<draw:color draw:name="LibreGreen 1" draw:color="#18a303" />
-<draw:color draw:name="LibreGreen 2" draw:color="#2cee0e" />
-<draw:color draw:name="LibreGreen 3" draw:color="#84f671" />
-<draw:color draw:name="LibreGreen 4" draw:color="#c2f6ba" />
-<draw:color draw:name="LibreBlue 1" draw:color="#0369a3" />
-<draw:color draw:name="LibreBlue 2" draw:color="#0e9cee" />
-<draw:color draw:name="LibreBlue 3" draw:color="#49bafb" />
-<draw:color draw:name="LibreBlue 4" draw:color="#9fd7f6" />
-<draw:color draw:name="LibreMaroon 1" draw:color="#a33e03" />
-<draw:color draw:name="LibreMaroon 2" draw:color="#f25f0a" />
-<draw:color draw:name="LibreMaroon 3" draw:color="#fc9b63" />
-<draw:color draw:name="LibreMaroon 4" draw:color="#f8c9ac" />
-<draw:color draw:name="LibrePurple 1" draw:color="#8e03a3" />
-<draw:color draw:name="LibrePurple 2" draw:color="#cf42e4" />
-<draw:color draw:name="LibrePurple 3" draw:color="#db76ea" />
-<draw:color draw:name="LibrePurple 4" draw:color="#f2c4fa" />
-<draw:color draw:name="LibreYellow 1" draw:color="#cea000" />
-<draw:color draw:name="LibreYellow 2" draw:color="#f8c004" />
-<draw:color draw:name="LibreYellow 3" draw:color="#fdd24b" />
-<draw:color draw:name="LibreYellow 4" draw:color="#fee698" />
+  <draw:color draw:name="Libre Green 0" draw:color="#106802"/>
+  <draw:color draw:name="Libre Green 1" draw:color="#18a303"/>
+  <draw:color draw:name="Libre Green 2" draw:color="#43c330"/>
+  <draw:color draw:name="Libre Green 3" draw:color="#92e285"/>
+  <draw:color draw:name="Libre Green 4" draw:color="#ccf4c6"/>
+  <draw:color draw:name="Libre Blue 0" draw:color="#023f62"/>
+  <draw:color draw:name="Libre Blue 1" draw:color="#0369a3"/>
+  <draw:color draw:name="Libre Blue 2" draw:color="#1c99e0"/>
+  <draw:color draw:name="Libre Blue 3" draw:color="#63bbee"/>
+  <draw:color draw:name="Libre Blue 4" draw:color="#aadcf7"/>
+  <draw:color draw:name="Libre Orange 0" draw:color="#622502"/>
+  <draw:color draw:name="Libre Orange 1" draw:color="#a33e03"/>
+  <draw:color draw:name="Libre Orange 2" draw:color="#d36118"/>
+  <draw:color draw:name="Libre Orange 3" draw:color="#f09e6f"/>
+  <draw:color draw:name="Libre Orange 4" draw:color="#f9cfb5"/>
+  <draw:color draw:name="Libre Purple 0" draw:color="#530260"/>
+  <draw:color draw:name="Libre Purple 1" draw:color="#8e03a3"/>
+  <draw:color draw:name="Libre Purple 2" draw:color="#c254d2"/>
+  <draw:color draw:name="Libre Purple 3" draw:color="#dc85e9"/>
+  <draw:color draw:name="Libre Purple 4" draw:color="#f2cbf8"/>
+  <draw:color draw:name="Libre Yellow 0" draw:color="#876900"/>
+  <draw:color draw:name="Libre Yellow 1" draw:color="#c99c00"/>
+  <draw:color draw:name="Libre Yellow 2" draw:color="#e9b913"/>
+  <draw:color draw:name="Libre Yellow 3" draw:color="#f5cd53"/>
+  <draw:color draw:name="Libre Yellow 4" draw:color="#fde9a9"/>
+  <draw:color draw:name="Green Accent" draw:color="#2cee0e"/>
+  <draw:color draw:name="Blue Accent" draw:color="#00a0fc"/>
+  <draw:color draw:name="Orange Accent" draw:color="#fc5c00"/>
+  <draw:color draw:name="Purple Accent" draw:color="#e327ff"/>
+  <draw:color draw:name="Yellow Accent" draw:color="#ffd74c"/>
 </ooo:color-table>
diff --git a/extras/source/palettes/standard.soc b/extras/source/palettes/standard.soc
index 202e67d80aa1..1bab7f6ed5dc 100644
--- a/extras/source/palettes/standard.soc
+++ b/extras/source/palettes/standard.soc
@@ -99,20 +99,4 @@
   <draw:color draw:name="Chart 10" draw:color="#ff950e"/>
   <draw:color draw:name="Chart 11" draw:color="#c5000b"/>
   <draw:color draw:name="Chart 12" draw:color="#0084d1"/>
-  <draw:color draw:name="LibreGreen 1" draw:color="#18a303"/>
-  <draw:color draw:name="LibreGreen 2" draw:color="#2cee0e"/>
-  <draw:color draw:name="LibreGreen 3" draw:color="#84f671"/>
-  <draw:color draw:name="LibreGreen 4" draw:color="#c2f6ba"/>
-  <draw:color draw:name="LibreBlue 1" draw:color="#0369a3"/>
-  <draw:color draw:name="LibreBlue 2" draw:color="#0e9cee"/>
-  <draw:color draw:name="LibreBlue 3" draw:color="#49bafb"/>
-  <draw:color draw:name="LibreBlue 4" draw:color="#9fd7f6"/>
-  <draw:color draw:name="LibreMaroon 1" draw:color="#a33e03"/>
-  <draw:color draw:name="LibreMaroon 2" draw:color="#f25f0a"/>
-  <draw:color draw:name="LibreMaroon 3" draw:color="#fc9b63"/>
-  <draw:color draw:name="LibreMaroon 4" draw:color="#f8c9ac"/>
-  <draw:color draw:name="LibrePurple 1" draw:color="#8e03a3"/>
-  <draw:color draw:name="LibrePurple 2" draw:color="#cf42e4"/>
-  <draw:color draw:name="LibrePurple 3" draw:color="#db76ea"/>
-  <draw:color draw:name="LibrePurple 4" draw:color="#f2c4fa"/>
 </office:color-table>
diff --git a/extras/source/wordbook/makefile.mk b/extras/source/wordbook/makefile.mk
index a012b89686f1..d65e627bab3d 100644
--- a/extras/source/wordbook/makefile.mk
+++ b/extras/source/wordbook/makefile.mk
@@ -39,7 +39,7 @@ TARGET=wordbookall
 
 ZIP1TARGET      = $(WORDBOOK_ALL_TARGET)
 
-ZIP1LIST        = oracle.dic
+ZIP1LIST        = technical.dic
 
 
 ZIP2TARGET      = $(WORDBOOK_USER_TARGET)
diff --git a/extras/source/wordbook/technical.dic b/extras/source/wordbook/technical.dic
new file mode 100644
index 000000000000..b79e217ecfb1
--- /dev/null
+++ b/extras/source/wordbook/technical.dic
@@ -0,0 +1,215 @@
+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
+Add-in
+Adobe
+Advanced
+AMD
+Android
+AppConnect=
+AppWizard=
+AppXaminer=
+AppXNavigator=
+AppXRay=
+Apple
+Asus
+Argus=
+AutoVue=
+Base=
+Base24=
+Bing
+CADView=
+Canon
+Calc=
+Capgemini
+Cisco=
+Chrome
+Clickstream=
+Cognos=
+Connect2OracleSelf=
+ConText=
+COREid=
+Corporation
+Dell
+Devices
+DocLink
+Docuflex=
+Documaker=
+Document
+Draw=
+Electronics
+Ethernet
+Evolution
+Exadata=
+Facebook
+Firebird
+Firefox
+Foundation
+Foxconn
+Fujitsu
+GNOME
+GNU
+Google
+Hewlett-Packard
+Hi-Fi
+Hitachi
+HP
+IBM
+Identi.ca
+Impress=
+Intel
+KDE
+LDAP
+Lenovo
+Linux
+MasterCard
+Math=
+Micro
+Microsoft=
+MicroStrategy=
+Mono
+Motorola
+Mozilla
+NEC
+Nokia
+OpenText=
+OpenWorld=
+OpenZorg=
+Opera
+Optronics
+Oracle=
+Panasonic
+PayPal
+PeopleSoft=
+Plug-in
+PostgreSQL
+PPPoE
+Quanta
+RosettaNet=
+Samba
+Samsung
+SAP
+Satmetrix=
+Sharp
+Skype
+Sony
+StorageTek=
+Sun=
+SunHSI=
+SunSAI=
+The
+TeliaSonera
+Thunderbird
+Toshiba
+Twitter
+VoIP=
+Visa
+Wi-Fi
+WiMAX
+Windows
+Writer=
+Yahoo
+YouTube
+endian
+endianness
+Kerberos
+debootstrap
+userspace
+FreeBSD
+OpenBSD
+NetBSD
+dpkg
+rpm
+gcc
+gcj
+gij
+GPS
+spamassassin
+Xen
+uname
+Ogg
+Vorbis
+FLAC