Merge branch 'master' into feature/gnumake4

Conflicts:
Repository.mk
RepositoryFixes.mk
configure
configure.in
set_soenv.in
solenv/config/sdev300.ini
solenv/gbuild/ComponentTarget.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/CustomTarget.mk
solenv/gbuild/Deliver.mk
solenv/gbuild/Executable.mk
solenv/gbuild/JavaClassSet.mk
solenv/gbuild/Library.mk
solenv/gbuild/LinkTarget.mk
solenv/gbuild/StaticLibrary.mk
solenv/gbuild/TargetLocations.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/linux.mk
solenv/gbuild/platform/macosx.mk
solenv/gbuild/platform/solaris.mk
solenv/gbuild/platform/windows.mk
solenv/gbuild/platform/winmingw.mk
solenv/gbuild/templates/Executable.mk
solenv/gbuild/templates/Library.mk
solenv/inc/libs.mk
solenv/inc/unxobsd.mk

101 files changed, 9340 insertions, 1317 deletions

diff --git a/scp2/source/accessories/file_font_accessories.scp b/scp2/source/accessories/file_font_accessories.scp
new file mode 100644
index 000000000000..9adbe4bdfacf
--- /dev/null
+++ b/scp2/source/accessories/file_font_accessories.scp
@@ -0,0 +1,882 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* Airmole font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole ) 
+#endif 
+
+/* Airmole Antique font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique ) 
+#endif 
+
+/* Airmole Shaded font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded ) 
+#endif 
+
+/* Airmole Stripe font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe ) 
+#endif 
+
+/* Astron Boy font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy ) 
+#endif 
+
+/* Astron Boy Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic ) 
+#endif 
+
+/* Astron Boy Video font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video ) 
+#endif 
+
+/* Astron Boy Wonder font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder ) 
+#endif 
+
+/* Baveuse font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse ) 
+#endif 
+
+/* Berylium font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium ) 
+#endif 
+
+/* Berylium Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
+#endif 
+
+/* Berylium Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic ) 
+#endif 
+
+/* Berylium Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic ) 
+#endif 
+
+/* Betsy Flanagan 2 font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 ) 
+#endif 
+
+/* Blue Highway font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway ) 
+#endif 
+
+/* Blue Highway Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold ) 
+#endif 
+
+/* Blue Highway Condensed font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed ) 
+#endif 
+
+/* Blue Highway Linocut font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut ) 
+#endif 
+
+/* Bullpen font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen ) 
+#endif 
+
+/* Bullpen 3D font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D ) 
+#endif 
+
+/* Bullpen Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic ) 
+#endif 
+
+/* Colourbars font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars ) 
+#endif 
+
+/* Colourbars Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold ) 
+#endif 
+
+/* Counterscraps font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps ) 
+#endif 
+
+/* Credit Valley font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley ) 
+#endif 
+
+/* Credit Valley Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold ) 
+#endif 
+
+/* Credit Valley Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic ) 
+#endif 
+
+/* Credit Valley Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic ) 
+#endif 
+
+/* Edmunds font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds ) 
+#endif 
+
+/* Edmunds Distressed font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed ) 
+#endif 
+
+/* Engebrechtre font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre ) 
+#endif
+
+/* Engebrechtre Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold ) 
+#endif
+
+/* Engebrechtre Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic ) 
+#endif
+
+/* Engebrechtre Expanded font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded ) 
+#endif
+
+/* Engebrechtre Expanded Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold ) 
+#endif
+
+/* Engebrechtre Expanded Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic ) 
+#endif
+
+/* Engebrechtre Expanded Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic ) 
+#endif
+
+/* Engebrechtre Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic ) 
+#endif
+
+/* Goodfish font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish ) 
+#endif
+
+/* Goodfish Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold ) 
+#endif
+
+/* Goodfish Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic ) 
+#endif
+
+/* Goodfish Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic ) 
+#endif
+
+/* Guanine font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine ) 
+#endif
+
+/* Gunplay font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay ) 
+#endif
+
+/* Kirsty font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty ) 
+#endif
+
+/* Kirsty Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold ) 
+#endif
+
+/* Kirsty Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic ) 
+#endif
+
+/* Kirsty Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic ) 
+#endif
+
+/* Kirsty Ink font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink ) 
+#endif
+
+/* Mufferaw font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw ) 
+#endif
+
+/* Nasalization font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization ) 
+#endif
+
+/* Neuropol font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol ) 
+#endif
+
+/* Numberpile font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile ) 
+#endif
+
+/* Pricedown font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown ) 
+#endif
+
+/* Pupcat font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat ) 
+#endif
+
+/* Rina font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_rina, rina.ttf, Rina ) 
+#endif
+
+/* Sandoval font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval ) 
+#endif
+
+/* Sappy Mugs font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs ) 
+#endif
+
+/* Screengem font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem ) 
+#endif
+
+/* Steelfish font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish ) 
+#endif
+
+/* Steelfish Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold ) 
+#endif
+
+/* Steelfish Outline font */ 
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline ) 
+#endif
+
+/* Strenuous font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous ) 
+#endif
+
+/* Strenuous 3D font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D ) 
+#endif
+
+/* Subpear font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear ) 
+#endif
+
+/* Teen font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen ) 
+#endif
+
+/* Teen Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold ) 
+#endif
+
+/* Teen Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic ) 
+#endif
+
+/* Teen Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic ) 
+#endif
+
+/* Teen Light font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light ) 
+#endif
+
+/* Teen Light Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic ) 
+#endif
+
+/* Typodermic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic ) 
+#endif
+
+/* Vahika font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika ) 
+#endif
+
+/* Vahika Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold ) 
+#endif
+
+/* Vahika Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic ) 
+#endif
+
+/* Vahika Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic ) 
+#endif
+
+/* Vectroid font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid ) 
+#endif
+
+/* Velvenda Cooler font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler ) 
+#endif
+
+/* Velvenda Megablack font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack ) 
+#endif
+
+/* Vibrocentric font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric ) 
+#endif
+
+/* Vibrocentric Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold ) 
+#endif
+
+/* Vibrocentric Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic ) 
+#endif
+
+/* Vibrocentric Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic ) 
+#endif
+
+/* Wintermute font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute ) 
+#endif
+
+/* You're Gone font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
+#endif
+
+/* You're Gone Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
+#endif
+
+/* Zekton font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton ) 
+#endif
+
+/* Zekton Bold font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold ) 
+#endif
+
+/* Zekton Bold Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic ) 
+#endif
+
+/* Zekton Italic font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
+#endif
+
+/* Zorque font */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque ) 
+#endif
+
+/* Additional fonts for 2.0.3 */
+
+/* URW Gothic L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Avantgarde, a010013l.ttf, URW Gothic L ) 
+#endif
+ 
+/* URW Gothic L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Bold_Avantgarde, a010015l.ttf, URW Gothic L Bold ) 
+#endif
+ 
+/* URW Gothic L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Italic_Avantgarde, a010033l.ttf, URW Gothic L Italic ) 
+#endif
+ 
+/* URW Gothic L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, URW Gothic L Bold Italic ) 
+#endif
+ 
+/* URW Bookman L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bookman, b018012l.ttf, URW Bookman L ) 
+#endif
+ 
+/* URW Bookman L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bold_Bookman, b018015l.ttf, URW Bookman L Bold ) 
+#endif
+ 
+/* URW Bookman L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Italic_Bookman, b018032l.ttf, URW Bookman L Italic ) 
+#endif
+ 
+/* URW Bookman L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Bookman_L_Bold_Italic_Bookman, b018035l.ttf, URW Bookman L Bold Italic ) 
+#endif
+ 
+/* URW Century Schoolbook L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, URW Century Schoolbook L ) 
+#endif
+ 
+/* URW Century Schoolbook L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, URW Century Schoolbook L Bold ) 
+#endif
+ 
+/* URW Century Schoolbook L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, URW Century Schoolbook L Italic ) 
+#endif
+ 
+/* URW Century Schoolbook L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, URW Century Schoolbook L Bold Italic ) 
+#endif
+ 
+/* URW Nimbus Sans L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica, n019003l.ttf, URW Nimbus Sans L ) 
+#endif
+ 
+/* URW Nimbus Sans L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, URW Nimbus Sans L Bold ) 
+#endif
+ 
+/* URW Nimbus Sans L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, URW Nimbus Sans L Italic ) 
+#endif
+ 
+/* URW Nimbus Sans L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, URW Nimbus Sans L Bold Italic ) 
+#endif
+ 
+/* URW Nimbus Sans L Condensed */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, URW Nimbus Sans L Condensed ) 
+#endif
+ 
+/* URW Nimbus Sans L Bold Condensed */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, URW Nimbus Sans L Bold Condensed ) 
+#endif
+ 
+/* URW Nimbus Sans L Italic Condensed */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, URW Nimbus Sans L Italic Condensed ) 
+#endif
+ 
+/* URW Nimbus Sans L Bold Italic Condensed */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, URW Nimbus Sans L Bold Italic Condensed ) 
+#endif
+ 
+/* URW Nimbus Roman No9 L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Times, n021003l.ttf, URW Nimbus Roman No9 L ) 
+#endif
+ 
+/* URW Nimbus Roman No9 L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, URW Nimbus Roman No9 L Bold ) 
+#endif
+ 
+/* URW Nimbus Roman No9 L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, URW Nimbus Roman No9 L Italic ) 
+#endif
+ 
+/* URW Nimbus Roman No9 L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, URW Nimbus Roman No9 L Bold Italic ) 
+#endif
+ 
+/* URW Nimbus Mono L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Courier, n022003l.ttf, URW Nimbus Mono L ) 
+#endif
+ 
+/* URW Nimbus Mono L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Courier, n022004l.ttf, URW Nimbus Mono L Bold ) 
+#endif
+ 
+/* URW Nimbus Mono LK Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, URW Nimbus Mono LK Italic ) 
+#endif
+ 
+/* URW Nimbus Mono L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, URW Nimbus Mono L Bold Italic ) 
+#endif
+ 
+/* URW Palladio L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Palitino, p052003l.ttf, URW Palladio L ) 
+#endif
+ 
+/* URW Palladio L Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Bold_Palitino, p052004l.ttf, URW Palladio L Bold ) 
+#endif
+ 
+/* URW Palladio L Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Italic_Palitino, p052023l.ttf, URW Palladio L Italic ) 
+#endif
+ 
+/* URW Palladio L Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Palladio_L_Bold_Italic_Palitino, p052024l.ttf, URW Palladio L Bold Italic ) 
+#endif
+ 
+/* URW Standard Symbols L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Standard_Symbols_L_Symbol, s050000l.ttf, URW Standard Symbols L ) 
+#endif
+ 
+/* URW Chancery L */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_URW_Chancery_L_Zapf_Chancery, z003034l.ttf, URW Chancery L ) 
+#endif
+ 
+/* Dingbats */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats ) 
+#endif
+ 
+/* Luxi Mono Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold ) 
+#endif
+ 
+/* Luxi Mono Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique ) 
+#endif
+ 
+/* Luxi Mono Regular */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular ) 
+#endif
+ 
+/* Luxi Mono Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique ) 
+#endif
+ 
+/* Luxi Serif Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold ) 
+#endif
+ 
+/* Luxi Serif Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique ) 
+#endif
+ 
+/* Luxi Serif Regular */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular ) 
+#endif
+ 
+/* Luxi Serif Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique ) 
+#endif
+ 
+/* Luxi Sans Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold ) 
+#endif
+ 
+/* Luxi Sans Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique ) 
+#endif
+ 
+/* Luxi Sans Regular */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular ) 
+#endif
+ 
+/* Luxi Sans Oblique */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
+#endif
+
+/* Gentium */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
+#endif
+
+/* Gentium Italic */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
+#endif
+
+/* GentiumAlt */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
+#endif
+
+/* GentiumAlt Italic */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
+#endif
+
+/* MgOpen Canonica Bold */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
+#endif
+
+/* MgOpen Canonica Bold Italic */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
+#endif
+
+/* MgOpen Canonica Italic */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
+#endif
+
+/* MgOpen Canonica Regular */
+#ifdef WITH_EXTRA_FONT
+STD_FONT_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
+#endif
+
+/* Chopin Script */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Chopin_Script, CHOPS___.TTF, Chopin Script ) 
+#endif
+
+/* DTP Dingbats */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_DTPDingbats, DTPDingbats.ttf, DTP Dingbats ) 
+#endif
+
+/* Justus Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus_Bold, Justus-Bold.ttf, Justus Bold ) 
+#endif
+
+/* Justus Italic Oldstyle */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus_ItalicOldstyle, Justus-ItalicOldstyle.ttf, Justus Italic Oldstyle ) 
+#endif
+
+/* Justus Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus_Italic, Justus-Italic.ttf, Justus Italic ) 
+#endif
+
+/* Justus Oldstyle */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus_Oldstyle, Justus-Oldstyle.ttf, Justus Oldstyle ) 
+#endif
+
+/* Justus Roman */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus_Roman, Justus-Roman.ttf, Justus Roman ) 
+#endif
+
+/* Justus Versalitas */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Justus_Versalitas, Justus-Versalitas.ttf, Justus Versalitas ) 
+#endif
+
+/* Let's trace basic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Lets_trace_basic, letstracebasic.ttf, Lets trace basic  ) 
+#endif
+
+/* Let's trace ruled */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Lets_trace_ruled, letstraceruled.ttf, Lets trace ruled ) 
+#endif
+
+/* Tuffy Bold Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold_Italic, Tuffy_Bold_Italic.ttf, Tuffy Bold Italic ) 
+#endif
+
+/* Tuffy Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Tuffy_Bold, Tuffy_Bold.ttf, Tuffy Bold ) 
+#endif
+
+/* Tuffy Italic */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Tuffy_Italic, Tuffy_Italic.ttf, Tuffy Italic ) 
+#endif
+
+/* Tuffy */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Tuffy, Tuffy.ttf, Tuffy ) 
+#endif
+
+/* Verina Sans Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold_Oblique, Verina_Sans_Bold_Oblique.otf, Verina Sans Bold Oblique ) 
+#endif
+
+/* Verina Sans Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Bold, Verina_Sans_Bold.otf, Verina Sans Bold ) 
+#endif
+
+/* Verina Sans Mono Bold Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold_Oblique, Verina_Sans_Mono_Bold_Oblique.otf, Verina Sans Mono Bold Oblique ) 
+#endif
+
+/* Verina Sans Mono Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Bold, Verina_Sans_Mono_Bold.otf, Verina Sans Mono Bold ) 
+#endif
+
+/* Verina Sans Mono Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono_Oblique, Verina_Sans_Mono_Oblique.otf, Verina Sans Mono Oblique ) 
+#endif
+
+/* Verina Sans Mono */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Mono, Verina_Sans_Mono.otf, Verina Sans Mono ) 
+#endif
+
+/* Verina Sans Oblique */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Oblique, Verina_Sans_Oblique.otf, Verina Sans Oblique ) 
+#endif
+
+/* Verina Sans Roman */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Sans_Roman, Verina_Sans_Roman.otf, Verina Sans Roman ) 
+#endif
+
+/* Verina Serif Bold */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Serif_Bold, Verina_Serif_Bold.otf, Verina Serif Bold ) 
+#endif
+
+/* Verina Serif */ 
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_Verina_Serif, Verina_Serif.otf, Verina Serif ) 
+#endif
+
diff --git a/scp2/source/accessories/file_gallery_accessories.scp b/scp2/source/accessories/file_gallery_accessories.scp
new file mode 100644
index 000000000000..46706e1ab54f
--- /dev/null
+++ b/scp2/source/accessories/file_gallery_accessories.scp
@@ -0,0 +1,139 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* *** Accessories Extras *** */
+
+/* ** Gallery ** */
+
+#ifdef WITH_EXTRA_GALLERY
+
+File gid_File_Extra_Gallery_Accessories
+    Dir = gid_Dir_Gallery;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgallery.zip";
+End
+
+File gid_File_Extra_Gallery_Draws_People_Accessories
+    Dir = gid_Dir_Gallery_Draws_People;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgallerydrawspeople.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Plants_Accessories
+    Dir = gid_Dir_Gallery_Photos_Plants;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosplants.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Celebration_Accessories
+    Dir = gid_Dir_Gallery_Photos_Celebration;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotoscelebration.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Fauna_Accessories
+    Dir = gid_Dir_Gallery_Photos_Fauna;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosfauna.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Flowers_Accessories
+    Dir = gid_Dir_Gallery_Photos_Flowers;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosflowers.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories
+    Dir = gid_Dir_Gallery_Photos_FoodsandDrinks;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosfoodsanddrinks.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Humans_Accessories
+    Dir = gid_Dir_Gallery_Photos_Humans;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotoshumans.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Landscapes_Accessories
+    Dir = gid_Dir_Gallery_Photos_Landscapes;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotoslandscapes.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Buildings_Accessories
+    Dir = gid_Dir_Gallery_Photos_Buildings;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosbuildings.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Objects_Accessories
+    Dir = gid_Dir_Gallery_Photos_Objects;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosobjects.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Cities_Accessories
+    Dir = gid_Dir_Gallery_Photos_Cities;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotoscities.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Space_Accessories
+    Dir = gid_Dir_Gallery_Photos_Space;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosspace.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Statues_Accessories
+    Dir = gid_Dir_Gallery_Photos_Statues;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotosstatues.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Travel_Accessories
+    Dir = gid_Dir_Gallery_Photos_Travel;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryphotostravel.zip";
+End
+
+File gid_File_Extra_Gallery_Elements_Bullets2_Accessories
+    Dir = gid_Dir_Gallery_Elements_Bullets2;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgalleryelementsbullets2.zip";
+End
+
+File gid_File_Extra_Gallery_NONFREE_Accessories
+    Dir = gid_Dir_Gallery;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "accessoriesgallerynonfree.zip";
+End
+
+#endif
diff --git a/scp2/source/accessories/file_samples_accessories.scp b/scp2/source/accessories/file_samples_accessories.scp
new file mode 100644
index 000000000000..7b4486fee8e0
--- /dev/null
+++ b/scp2/source/accessories/file_samples_accessories.scp
@@ -0,0 +1,81 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* *** Accessories Extras *** */
+
+/* ** Samples ** */
+
+#ifdef WITH_EXTRA_SAMPLE
+
+File gid_File_Extra_Samples_Accessories
+    Dir = gid_Dir_Samples_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamples,zip);
+End
+
+File gid_File_Extra_Samples_Documentations_Accessories
+    Dir = gid_Dir_Samples_Documentations;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesdocumentation,zip);
+End
+
+File gid_File_Extra_Samples_Advertisement_Accessories
+    Dir = gid_Dir_Samples_Advertisement;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesadvertisement,zip);
+End
+
+/* ** Samples - NON FREE** */
+
+File gid_File_Extra_Samples_NONFREE_Accessories
+    Dir = gid_Dir_Samples_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfree,zip);
+End
+
+File gid_File_Extra_Samples_NONFREE_Documentations_Accessories
+    Dir = gid_Dir_Samples_Documentations;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfreedocumentation,zip);
+End
+
+File gid_File_Extra_Samples_NONFREE_Advertisement_Accessories
+    Dir = gid_Dir_Samples_Advertisement;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriessamplesnonfreeadvertisement,zip);
+End
+
+#endif
diff --git a/scp2/source/accessories/file_templates_accessories.scp b/scp2/source/accessories/file_templates_accessories.scp
new file mode 100644
index 000000000000..55689d907123
--- /dev/null
+++ b/scp2/source/accessories/file_templates_accessories.scp
@@ -0,0 +1,272 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+/* *** Accessories Extras *** */
+
+/* ** Templates ** */
+
+#ifdef WITH_EXTRA_TEMPLATE
+
+File gid_File_Extra_Templates_Accessories
+    Dir = gid_Dir_Template_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplates,zip);
+End
+
+File gid_File_Extra_Templates_Layout_Accessories
+    Dir = gid_Dir_Template_Layout;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateslayout,zip);
+End
+
+File gid_File_Extra_Templates_Present_Accessories
+    Dir = gid_Dir_Template_Presnt;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatespresent,zip);
+End
+
+File gid_File_Extra_Templates_Educate_Accessories
+    Dir = gid_Dir_Template_Educate;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateseducate,zip);
+End
+
+File gid_File_Extra_Templates_Finance_Accessories
+    Dir = gid_Dir_Template_Finance;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesfinance,zip);
+End
+
+File gid_File_Extra_Templates_Forms_Accessories
+    Dir = gid_Dir_Template_Forms;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesforms,zip);
+End
+
+File gid_File_Extra_Templates_Labels_Accessories
+    Dir = gid_Dir_Template_Labels;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplateslabels,zip);
+End
+
+File gid_File_Extra_Templates_Misc_Accessories
+    Dir = gid_Dir_Template_Misc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesmisc,zip);
+End
+
+File gid_File_Extra_Templates_Officorr_Accessories
+    Dir = gid_Dir_Template_Officorr;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesofficorr,zip);
+End
+
+File gid_File_Extra_Templates_Offimisc_Accessories
+    Dir = gid_Dir_Template_Offimisc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesoffimisc,zip);
+End
+
+File gid_File_Extra_Templates_Personal_Accessories
+    Dir = gid_Dir_Template_Personal;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatespersonal,zip);
+End
+
+/* ** Templates - Common ** */
+
+File gid_File_Extra_Templates_Common
+    Dir = gid_Dir_Template_Common;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommon.zip";
+End
+
+File gid_File_Extra_Templates_Common_Layout
+    Dir = gid_Dir_Template_Common_Layout;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonlayout.zip";
+End
+
+File gid_File_Extra_Templates_Common_Present
+    Dir = gid_Dir_Template_Common_Presnt;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonpresent.zip";
+End
+
+File gid_File_Extra_Templates_Common_Educate
+    Dir = gid_Dir_Template_Common_Educate;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommoneducate.zip";
+End
+
+File gid_File_Extra_Templates_Common_Finance
+    Dir = gid_Dir_Template_Common_Finance;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonfinance.zip";
+End
+
+File gid_File_Extra_Templates_Common_Forms
+    Dir = gid_Dir_Template_Common_Forms;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonforms.zip";
+End
+
+File gid_File_Extra_Templates_Common_Labels
+    Dir = gid_Dir_Template_Common_Labels;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonlabels.zip";
+End
+
+File gid_File_Extra_Templates_Common_Misc
+    Dir = gid_Dir_Template_Common_Misc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonmisc.zip";
+End
+
+File gid_File_Extra_Templates_Common_Officorr
+    Dir = gid_Dir_Template_Common_Officorr;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonofficorr.zip";
+End
+
+File gid_File_Extra_Templates_Common_Offimisc
+    Dir = gid_Dir_Template_Common_Offimisc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonoffimisc.zip";
+End
+
+File gid_File_Extra_Templates_Common_Personal
+    Dir = gid_Dir_Template_Common_Personal;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    Name = "accessoriestemplatescommonpersonal.zip";
+End
+
+/* ** Templates - NON FREE ** */
+
+File gid_File_Extra_Templates_NONFREE_Accessories
+    Dir = gid_Dir_Template_Language;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfree,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Layout_Accessories
+    Dir = gid_Dir_Template_Layout;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreelayout,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Present_Accessories
+    Dir = gid_Dir_Template_Presnt;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreepresent,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Educate_Accessories
+    Dir = gid_Dir_Template_Educate;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeeducate,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Finance_Accessories
+    Dir = gid_Dir_Template_Finance;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreefinance,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Forms_Accessories
+    Dir = gid_Dir_Template_Forms;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeforms,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Labels_Accessories
+    Dir = gid_Dir_Template_Labels;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreelabels,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Misc_Accessories
+    Dir = gid_Dir_Template_Misc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreemisc,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Officorr_Accessories
+    Dir = gid_Dir_Template_Officorr;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeofficorr,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Offimisc_Accessories
+    Dir = gid_Dir_Template_Offimisc;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreeoffimisc,zip);
+End
+
+File gid_File_Extra_Templates_NONFREE_Personal_Accessories
+    Dir = gid_Dir_Template_Personal;
+    TXT_FILE_BODY;
+    Styles = (ARCHIVE, DONT_OVERWRITE);
+    EXTRA_ALL_LANG(accessoriestemplatesnonfreepersonal,zip);
+End
+
+#endif
diff --git a/scp2/source/accessories/makefile.mk b/scp2/source/accessories/makefile.mk
new file mode 100644
index 000000000000..45c81ca14582
--- /dev/null
+++ b/scp2/source/accessories/makefile.mk
@@ -0,0 +1,86 @@
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#       Kálmán Szalai - KAMI <kami911@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+#
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+PRJ=..$/..
+
+PRJPCH=
+
+PRJNAME=scp2
+TARGET=accessories
+TARGETTYPE=CUI
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+SCP_PRODUCT_TYPE=osl
+PARFILES= \
+        module_accessories.par
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+PARFILES += \
+        module_gallery_accessories.par     \
+        file_gallery_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+PARFILES += \
+        module_templates_accessories.par   \
+        file_templates_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+PARFILES += \
+        module_samples_accessories.par     \
+        file_samples_accessories.par
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+PARFILES += \
+        module_font_accessories.par        \
+        file_font_accessories.par
+.ENDIF
+
+ULFFILES= \
+        module_accessories.ulf
+.IF "$(WITH_EXTRA_GALLERY)" != ""
+ULFFILES += \
+        module_gallery_accessories.ulf
+.ENDIF
+.IF "$(WITH_EXTRA_TEMPLATE)" != ""
+ULFFILES += \
+        module_templates_accessories.ulf
+.ENDIF
+.IF "$(WITH_EXTRA_SAMPLE)" != ""
+ULFFILES += \
+        module_samples_accessories.ulf
+.ENDIF
+.IF "$(WITH_EXTRA_FONT)" != ""
+ULFFILES += \
+        module_font_accessories.ulf
+.ENDIF
+
+
+# --- File ---------------------------------------------------------
+.INCLUDE :  target.mk
diff --git a/scp2/source/accessories/module_accessories.scp b/scp2/source/accessories/module_accessories.scp
new file mode 100644
index 000000000000..ded4717f417a
--- /dev/null
+++ b/scp2/source/accessories/module_accessories.scp
@@ -0,0 +1,40 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories
+    ParentID = gid_Module_Optional;
+    Files = (
+  ); 
+    Sortkey = "300";
+    Minimal = NO;
+    Default = YES;
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES);
+End
+
diff --git a/scp2/source/accessories/module_accessories.ulf b/scp2/source/accessories/module_accessories.ulf
new file mode 100644
index 000000000000..4c1adde8aaa2
--- /dev/null
+++ b/scp2/source/accessories/module_accessories.ulf
@@ -0,0 +1,33 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES]
+en-US = "Accessories"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES]
+en-US = "Useful %PRODUCTNAME accessories including various Galleries, Templates, Sample documents and Fonts."
diff --git a/scp2/source/accessories/module_font_accessories.scp b/scp2/source/accessories/module_font_accessories.scp
new file mode 100644
index 000000000000..b41eb09cba02
--- /dev/null
+++ b/scp2/source/accessories/module_font_accessories.scp
@@ -0,0 +1,205 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_FONT
+
+Module gid_Module_Optional_Accessories_Fonts
+    PackageInfo = "packinfo_accessories.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_FONTS);
+    ParentID = gid_Module_Optional_Accessories;
+    Files = ( 
+        gid_File_Fnt_airmole,
+        gid_File_Fnt_airmolea,
+        gid_File_Fnt_airmoles,
+        gid_File_Fnt_airmoleq,
+        gid_File_Fnt_astronbo,
+        gid_File_Fnt_astronbi,
+        gid_File_Fnt_astronbv,
+        gid_File_Fnt_astronbw,
+        gid_File_Fnt_baveuse,
+        gid_File_Fnt_Berylium,
+        gid_File_Fnt_Beryliub,
+        gid_File_Fnt_Berylibi,
+        gid_File_Fnt_Beryliui,
+        gid_File_Fnt_BETSY2,
+        gid_File_Fnt_bluehigh,
+        gid_File_Fnt_bluebold,
+        gid_File_Fnt_bluecond,
+        gid_File_Fnt_bluehigl,
+        gid_File_Fnt_bullpen_,
+        gid_File_Fnt_bullpen3,
+        gid_File_Fnt_bullpeni,
+        gid_File_Fnt_colourba,
+        gid_File_Fnt_colourbb,
+        gid_File_Fnt_counters,
+        gid_File_Fnt_creditva,
+        gid_File_Fnt_creditvb,
+        gid_File_Fnt_creditvz,
+        gid_File_Fnt_creditvi,
+        gid_File_Fnt_edmunds,
+        gid_File_Fnt_edmundis,
+        gid_File_Fnt_engeregu,
+        gid_File_Fnt_engebold,
+        gid_File_Fnt_engeboit,
+        gid_File_Fnt_engeexpa,
+        gid_File_Fnt_engeexbo,
+        gid_File_Fnt_engeexbi,
+        gid_File_Fnt_engeexit,
+        gid_File_Fnt_engeital,
+        gid_File_Fnt_goodfish,
+        gid_File_Fnt_goodfisb,
+        gid_File_Fnt_goodfisc,
+        gid_File_Fnt_goodfisi,
+        gid_File_Fnt_guanine_,
+        gid_File_Fnt_gunplay,
+        gid_File_Fnt_kirsty__,
+        gid_File_Fnt_kirsty_b,
+        gid_File_Fnt_kirstybi,
+        gid_File_Fnt_kirsty_i,
+        gid_File_Fnt_kirstyin,
+        gid_File_Fnt_mufferaw,
+        gid_File_Fnt_nasaliza,
+        gid_File_Fnt_NEUROPOL,
+        gid_File_Fnt_numberpi,
+        gid_File_Fnt_pricedow,
+        gid_File_Fnt_pupcat__,
+        gid_File_Fnt_rina,
+        gid_File_Fnt_sandoval,
+        gid_File_Fnt_SAPPM___,
+        gid_File_Fnt_screenge,
+        gid_File_Fnt_steelfis,
+        gid_File_Fnt_steelfib,
+        gid_File_Fnt_steelout,
+        gid_File_Fnt_strenuou,
+        gid_File_Fnt_strenu3d,
+        gid_File_Fnt_subpear_,
+        gid_File_Fnt_teen____,
+        gid_File_Fnt_teenbold,
+        gid_File_Fnt_teenbdit,
+        gid_File_Fnt_teenital,
+        gid_File_Fnt_teenlite,
+        gid_File_Fnt_teenlita,
+        gid_File_Fnt_typoderm,
+        gid_File_Fnt_vahika_,
+        gid_File_Fnt_vahikab,
+        gid_File_Fnt_vahikac,
+        gid_File_Fnt_vahikai,
+        gid_File_Fnt_vectroid,
+        gid_File_Fnt_velvendc,
+        gid_File_Fnt_velvenda,
+        gid_File_Fnt_vibrocen,
+        gid_File_Fnt_vibroceb,
+        gid_File_Fnt_vibrocex,
+        gid_File_Fnt_vibrocei,
+        gid_File_Fnt_wintermu,
+        gid_File_Fnt_youregon,
+        gid_File_Fnt_youregoi,
+        gid_File_Fnt_zekton__,
+        gid_File_Fnt_zektonbo,
+        gid_File_Fnt_zektonbi,
+        gid_File_Fnt_zektonit,
+        gid_File_Fnt_zorque,
+        gid_File_Fnt_URW_Gothic_L_Avantgarde,
+        gid_File_Fnt_URW_Gothic_L_Bold_Avantgarde,
+        gid_File_Fnt_URW_Gothic_L_Italic_Avantgarde,
+        gid_File_Fnt_URW_Gothic_L_Bold_Italic_Avantgarde,
+        gid_File_Fnt_URW_Bookman_L_Bookman,
+        gid_File_Fnt_URW_Bookman_L_Bold_Bookman,
+        gid_File_Fnt_URW_Bookman_L_Italic_Bookman,
+        gid_File_Fnt_URW_Bookman_L_Bold_Italic_Bookman,
+        gid_File_Fnt_URW_Century_Schoolbook_L_New_Century_SchoolBook,
+        gid_File_Fnt_URW_Century_Schoolbook_L_Bold_New_Century_SchoolBook,
+        gid_File_Fnt_URW_Century_Schoolbook_L_Italic_New_Century_SchoolBook,
+        gid_File_Fnt_URW_Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Helvetica_Condensed,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Helvetica_Condensed,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Italic_Helvetica_Condensed,
+        gid_File_Fnt_URW_Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed,
+        gid_File_Fnt_URW_Nimbus_Roman_No9_L_Times,
+        gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Times,
+        gid_File_Fnt_URW_Nimbus_Roman_No9_L_Italic_Times,
+        gid_File_Fnt_URW_Nimbus_Roman_No9_L_Bold_Italic_Times,
+        gid_File_Fnt_URW_Nimbus_Mono_L_Courier,
+        gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Courier,
+        gid_File_Fnt_URW_Nimbus_Mono_LK_Italic_Courier,
+        gid_File_Fnt_URW_Nimbus_Mono_L_Bold_Italic_Courier,
+        gid_File_Fnt_URW_Palladio_L_Palitino,
+        gid_File_Fnt_URW_Palladio_L_Bold_Palitino,
+        gid_File_Fnt_URW_Palladio_L_Italic_Palitino,
+        gid_File_Fnt_URW_Palladio_L_Bold_Italic_Palitino,
+        gid_File_Fnt_URW_Standard_Symbols_L_Symbol,
+        gid_File_Fnt_URW_Chancery_L_Zapf_Chancery,
+        gid_File_Fnt_Dingbats,
+        gid_File_Fnt_Luxi_Mono_Bold,
+        gid_File_Fnt_Luxi_Mono_Bold_Oblique,
+        gid_File_Fnt_Luxi_Mono_Regular,
+        gid_File_Fnt_Luxi_Mono_Oblique,
+        gid_File_Fnt_Luxi_Serif_Bold,
+        gid_File_Fnt_Luxi_Serif_Bold_Oblique,
+        gid_File_Fnt_Luxi_Serif_Regular,
+        gid_File_Fnt_Luxi_Serif_Oblique,
+        gid_File_Fnt_Luxi_Sans_Bold,
+        gid_File_Fnt_Luxi_Sans_Bold_Oblique,
+        gid_File_Fnt_Luxi_Sans_Regular,
+        gid_File_Fnt_Luxi_Sans_Oblique,
+        gid_File_Fnt_Gentium,
+        gid_File_Fnt_Gentium_Italic,
+        gid_File_Fnt_GentiumAlt,
+        gid_File_Fnt_GentiumAlt_Italic,
+        gid_File_Fnt_MgOpen_Canonica_Bold,
+        gid_File_Fnt_MgOpen_Canonica_Bold_Italic,
+        gid_File_Fnt_MgOpen_Canonica_Italic,
+        gid_File_Fnt_MgOpen_Canonica_Regular,
+        gid_File_Fnt_MagyarLinBiolinum,
+        gid_File_Fnt_MagyarLinBiolinumB,
+        gid_File_Fnt_MagyarLinLibertine,
+        gid_File_Fnt_MagyarLinLibertineB,
+        gid_File_Fnt_MagyarLinLibertineBI,
+        gid_File_Fnt_MagyarLinLibertineC,
+        gid_File_Fnt_MagyarLinLibertineG,
+        gid_File_Fnt_MagyarLinLibertineGB,
+        gid_File_Fnt_MagyarLinLibertineGBI,
+        gid_File_Fnt_MagyarLinLibertineGI,
+        gid_File_Fnt_MagyarLinLibertineI,
+        gid_File_Fnt_MagyarLinLibertineN,
+        gid_File_Fnt_MagyarLinLibertineNB,
+        gid_File_Fnt_MagyarLinLibertineNBI,
+        gid_File_Fnt_MagyarLinLibertineNI,
+        gid_File_Fnt_MagyarLinLibertineNC );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
diff --git a/scp2/source/accessories/module_font_accessories.ulf b/scp2/source/accessories/module_font_accessories.ulf
new file mode 100644
index 000000000000..1fc26c1db003
--- /dev/null
+++ b/scp2/source/accessories/module_font_accessories.ulf
@@ -0,0 +1,33 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_FONTS]
+en-US = "Fonts"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_FONTS]
+en-US = "Additional fonts for %PRODUCTNAME and other applications."
diff --git a/scp2/source/accessories/module_gallery_accessories.scp b/scp2/source/accessories/module_gallery_accessories.scp
new file mode 100644
index 000000000000..533183d498bc
--- /dev/null
+++ b/scp2/source/accessories/module_gallery_accessories.scp
@@ -0,0 +1,60 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_GALLERY
+
+Module gid_Module_Optional_Accessories_Gallery
+    PackageInfo = "packinfo_accessories.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_GALLERY);
+    ParentID = gid_Module_Optional_Accessories;
+    Files = (
+        gid_File_Extra_Gallery_Accessories,
+        gid_File_Extra_Gallery_Draws_People_Accessories,
+        gid_File_Extra_Gallery_Photos_Plants_Accessories,
+        gid_File_Extra_Gallery_Photos_Celebration_Accessories,
+        gid_File_Extra_Gallery_Photos_Fauna_Accessories,
+        gid_File_Extra_Gallery_Photos_Flowers_Accessories,
+        gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories,
+        gid_File_Extra_Gallery_Photos_Humans_Accessories,
+        gid_File_Extra_Gallery_Photos_Landscapes_Accessories,
+        gid_File_Extra_Gallery_Photos_Objects_Accessories,
+        gid_File_Extra_Gallery_Photos_Buildings_Accessories,
+        gid_File_Extra_Gallery_Photos_Cities_Accessories,
+        gid_File_Extra_Gallery_Photos_Space_Accessories,
+        gid_File_Extra_Gallery_Photos_Statues_Accessories,
+        gid_File_Extra_Gallery_Photos_Travel_Accessories,
+        gid_File_Extra_Gallery_Elements_Bullets2_Accessories,
+        gid_File_Extra_Gallery_NONFREE_Accessories );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
diff --git a/scp2/source/accessories/module_gallery_accessories.ulf b/scp2/source/accessories/module_gallery_accessories.ulf
new file mode 100644
index 000000000000..31745dfffeb6
--- /dev/null
+++ b/scp2/source/accessories/module_gallery_accessories.ulf
@@ -0,0 +1,33 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
+en-US = "Additional Gallery Themes"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
+en-US = "The %PRODUCTNAME Gallery contains more than 3400 elements in various themes."
diff --git a/scp2/source/accessories/module_samples_accessories.scp b/scp2/source/accessories/module_samples_accessories.scp
new file mode 100644
index 000000000000..672774c68f98
--- /dev/null
+++ b/scp2/source/accessories/module_samples_accessories.scp
@@ -0,0 +1,98 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_SAMPLE
+
+Module gid_Module_Optional_Accessories_Advertisement
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+Module gid_Module_Optional_Accessories_Documentations
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+Module gid_Module_Optional_Accessories_Samples
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_SAMPLES);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#include "alllangmodules_accessories_samples_root.inc"
+
+Module gid_Module_Optional_Accessories_Adv_Template
+    ParentID = gid_Module_Optional_Accessories_Advertisement;
+    Name = "gid_Module_Optional_Accessories_Adv_Template";
+    Description = "gid_Module_Optional_Accessories_Adv_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Samples_Advertisement_Accessories,
+        gid_File_Extra_Samples_NONFREE_Advertisement_Accessories );
+    Minimal = NO;
+    Default = YES;
+End
+
+Module gid_Module_Optional_Accessories_Doc_Template
+    ParentID = gid_Module_Optional_Accessories_Documentations;
+    Name = "gid_Module_Optional_Accessories_Doc_Template";
+    Description = "gid_Module_Optional_Accessories_Doc_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Samples_Documentations_Accessories,
+        gid_File_Extra_Samples_NONFREE_Documentations_Accessories );
+    Minimal = YES;
+    Default = YES;
+End
+
+Module gid_Module_Optional_Accessories_Sam_Template
+    ParentID = gid_Module_Optional_Accessories_Samples;
+    Name = "gid_Module_Optional_Accessories_Sam_Template";
+    Description = "gid_Module_Optional_Accessories_Sam_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Samples_Accessories,
+        gid_File_Extra_Samples_NONFREE_Accessories  );
+    Minimal = NO;
+    Default = YES;
+End
+
+#include "alllangmodules_accessories_samples.inc"
+
+#endif
+
diff --git a/scp2/source/accessories/module_samples_accessories.ulf b/scp2/source/accessories/module_samples_accessories.ulf
new file mode 100644
index 000000000000..b6a0f5229786
--- /dev/null
+++ b/scp2/source/accessories/module_samples_accessories.ulf
@@ -0,0 +1,712 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_SAMPLES]
+en-US = "Sample documents"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_SAMPLES]
+en-US = "Sample documents are good for learning."
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS]
+en-US = "Documentations"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS]
+en-US = "%PRODUCTNAME documentations."
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT]
+en-US = "Advertisement"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT]
+en-US = "%PRODUCTNAME advertisement materials."
+
+[STR_NAME_MODULE_LANGPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_LANGPACK_EN_US]
+en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_LANGPACK_DE]
+en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_LANGPACK_FR]
+en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_LANGPACK_IT]
+en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_LANGPACK_ES]
+en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_LANGPACK_SV]
+en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_LANGPACK_PT]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_LANGPACK_PT_BR]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_LANGPACK_JA]
+en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_LANGPACK_KO]
+en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_LANGPACK_NL]
+en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_LANGPACK_HU]
+en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_LANGPACK_PL]
+en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_LANGPACK_RU]
+en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_LANGPACK_TR]
+en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_LANGPACK_EL]
+en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_LANGPACK_TH]
+en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_LANGPACK_CS]
+en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_LANGPACK_SK]
+en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_LANGPACK_HR]
+en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_LANGPACK_ET]
+en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_LANGPACK_VI]
+en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_LANGPACK_BG]
+en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_LANGPACK_KM]
+en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_LANGPACK_PA_IN]
+en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU_IN]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA_IN]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI_IN]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_LANGPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_LANGPACK_TN]
+en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_LANGPACK_XH]
+en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_LANGPACK_ZU]
+en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_LANGPACK_AF]
+en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW_TZ]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_LANGPACK_LO]
+en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_LANGPACK_NSO]
+en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_LANGPACK_BN]
+en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_BD]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_LANGPACK_BN_BD]
+en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_LANGPACK_BN_IN]
+en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR_IN]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR_IN]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR_IN]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR_IN]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_LANGPACK_NE]
+en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR_SA]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR_SA]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_LANGPACK_CA]
+en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_LANGPACK_DA]
+en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_LANGPACK_FI]
+en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_LANGPACK_HE]
+en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_LANGPACK_IS]
+en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NB]
+en-US = "Norwegian (Bokmal)"
+
+[STR_DESC_MODULE_LANGPACK_NB]
+en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_LANGPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RM]
+en-US = "Rhaeto-Romance"
+
+[STR_DESC_MODULE_LANGPACK_RM]
+en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_LANGPACK_RO]
+en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_LANGPACK_SQ]
+en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_LANGPACK_ID]
+en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_LANGPACK_UK]
+en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_LANGPACK_BE]
+en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_LANGPACK_SL]
+en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_LANGPACK_LV]
+en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_LANGPACK_LT]
+en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_LANGPACK_HY]
+en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_LANGPACK_EU]
+en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_LANGPACK_MK]
+en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MT]
+en-US = "Maltese"
+
+[STR_DESC_MODULE_LANGPACK_MT]
+en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_LANGPACK_CY]
+en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_LANGPACK_GL]
+en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH_YU]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH_YU]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_LANGPACK_GA]
+en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR_CS]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR_CS]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_LANGPACK_BS]
+en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AS_IN]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_LANGPACK_AS_IN]
+en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_LANGPACK_RW]
+en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SA]
+en-US = "Sanskrit"
+
+[STR_DESC_MODULE_LANGPACK_SA]
+en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FA]
+en-US = "Farsi"
+
+[STR_DESC_MODULE_LANGPACK_FA]
+en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FO]
+en-US = "Faroese"
+
+[STR_DESC_MODULE_LANGPACK_FO]
+en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SB]
+en-US = "Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_SB]
+en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_LANGPACK_TT]
+en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_LANGPACK_TS]
+en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_YI]
+en-US = "Yiddish"
+
+[STR_DESC_MODULE_LANGPACK_YI]
+en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_LANGPACK_BR]
+en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_LANGPACK_NR]
+en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_LANGPACK_SS]
+en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_LANGPACK_VE]
+en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_LANGPACK_KN]
+en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MS]
+en-US = "Malay (Malaysian)"
+
+[STR_DESC_MODULE_LANGPACK_MS]
+en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_LANGPACK_TG]
+en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_LANGPACK_KU]
+en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_LANGPACK_DZ]
+en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_LANGPACK_KA]
+en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_LANGPACK_EO]
+en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_LANGPACK_EN_ZA]
+en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_LANGPACK_EN_GB]
+en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR_IN]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR_IN]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ML_IN]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML_IN]
+en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TE_IN]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE_IN]
+en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TI_ER]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_LANGPACK_TI_ER]
+en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_LANGPACK_UZ]
+en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_LANGPACK_MN]
+en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
+
diff --git a/scp2/source/accessories/module_templates_accessories.scp b/scp2/source/accessories/module_templates_accessories.scp
new file mode 100644
index 000000000000..917cf69b93e6
--- /dev/null
+++ b/scp2/source/accessories/module_templates_accessories.scp
@@ -0,0 +1,99 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+#include "macros.inc"
+
+#ifdef WITH_EXTRA_TEMPLATE
+
+Module gid_Module_Optional_Accessories_Templates
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES);
+    ParentID = gid_Module_Optional_Accessories;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#include "alllangmodules_accessories_templates_root.inc"
+
+Module gid_Module_Optional_Accessories_Tem_Template
+    ParentID = gid_Module_Optional_Accessories_Templates;
+    Name = "gid_Module_Optional_Accessories_Tem_Template";
+    Description = "gid_Module_Optional_Accessories_Tem_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (
+        gid_File_Extra_Templates_Accessories,
+        gid_File_Extra_Templates_Layout_Accessories,
+        gid_File_Extra_Templates_Present_Accessories,
+        gid_File_Extra_Templates_Educate_Accessories,
+        gid_File_Extra_Templates_Finance_Accessories,
+        gid_File_Extra_Templates_Forms_Accessories,
+        gid_File_Extra_Templates_Labels_Accessories,
+        gid_File_Extra_Templates_Misc_Accessories,
+        gid_File_Extra_Templates_Officorr_Accessories,
+        gid_File_Extra_Templates_Offimisc_Accessories,
+        gid_File_Extra_Templates_Personal_Accessories,
+        gid_File_Extra_Templates_NONFREE_Accessories,
+        gid_File_Extra_Templates_NONFREE_Layout_Accessories,
+        gid_File_Extra_Templates_NONFREE_Present_Accessories,
+        gid_File_Extra_Templates_NONFREE_Educate_Accessories,
+        gid_File_Extra_Templates_NONFREE_Finance_Accessories,
+        gid_File_Extra_Templates_NONFREE_Forms_Accessories,
+        gid_File_Extra_Templates_NONFREE_Labels_Accessories,
+        gid_File_Extra_Templates_NONFREE_Misc_Accessories,
+        gid_File_Extra_Templates_NONFREE_Officorr_Accessories,
+        gid_File_Extra_Templates_NONFREE_Offimisc_Accessories,
+        gid_File_Extra_Templates_NONFREE_Personal_Accessories );
+    Minimal = NO;
+    Default = YES;
+End
+
+Module gid_Module_Optional_Accessories_Tem_Common
+    PackageInfo = "packinfo_accessories.txt";
+    ParentID = gid_Module_Optional_Accessories;
+    Name = "gid_Module_Optional_Accessories_Tem_Common";
+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON);
+    Files = (
+        gid_File_Extra_Templates_Common,
+        gid_File_Extra_Templates_Common_Layout,
+        gid_File_Extra_Templates_Common_Present,
+        gid_File_Extra_Templates_Common_Educate,
+        gid_File_Extra_Templates_Common_Finance,
+        gid_File_Extra_Templates_Common_Forms,
+        gid_File_Extra_Templates_Common_Labels,
+        gid_File_Extra_Templates_Common_Misc,
+        gid_File_Extra_Templates_Common_Officorr,
+        gid_File_Extra_Templates_Common_Offimisc,
+        gid_File_Extra_Templates_Common_Personal );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#include "alllangmodules_accessories_templates.inc"
+
+#endif
diff --git a/scp2/source/accessories/module_templates_accessories.ulf b/scp2/source/accessories/module_templates_accessories.ulf
new file mode 100644
index 000000000000..da17fc11244f
--- /dev/null
+++ b/scp2/source/accessories/module_templates_accessories.ulf
@@ -0,0 +1,707 @@
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ *       Kálmán Szalai - KAMI <kami911@gmail.com>
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Kálmán Szalai - KAMI <kami911@gmail.com>
+ *
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES]
+en-US = "Templates"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES]
+en-US = "Create perfect documents within seconds with document templates."
+
+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON]
+en-US = "Common templates"
+
+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_COMMON]
+en-US = "Create perfect documents within seconds with document templates. Common templates contain language independent templates."
+
+[STR_NAME_MODULE_LANGPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_LANGPACK_EN_US]
+en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_LANGPACK_DE]
+en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_LANGPACK_FR]
+en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_LANGPACK_IT]
+en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_LANGPACK_ES]
+en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_LANGPACK_SV]
+en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_LANGPACK_PT]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_LANGPACK_PT_BR]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_LANGPACK_JA]
+en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_LANGPACK_KO]
+en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_LANGPACK_NL]
+en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_LANGPACK_HU]
+en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_LANGPACK_PL]
+en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_LANGPACK_RU]
+en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_LANGPACK_TR]
+en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_LANGPACK_EL]
+en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_LANGPACK_TH]
+en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_LANGPACK_CS]
+en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_LANGPACK_SK]
+en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_LANGPACK_HR]
+en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_LANGPACK_ET]
+en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_LANGPACK_VI]
+en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_LANGPACK_BG]
+en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_LANGPACK_KM]
+en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_LANGPACK_PA_IN]
+en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU_IN]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA_IN]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI_IN]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_LANGPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_LANGPACK_TN]
+en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_LANGPACK_XH]
+en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_LANGPACK_ZU]
+en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_LANGPACK_AF]
+en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW_TZ]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_LANGPACK_LO]
+en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_LANGPACK_NSO]
+en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_LANGPACK_BN]
+en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_BD]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_LANGPACK_BN_BD]
+en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_LANGPACK_BN_IN]
+en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR_IN]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR_IN]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR_IN]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR_IN]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_LANGPACK_NE]
+en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR_SA]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR_SA]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_LANGPACK_CA]
+en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_LANGPACK_DA]
+en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_LANGPACK_FI]
+en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_LANGPACK_HE]
+en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_LANGPACK_IS]
+en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NB]
+en-US = "Norwegian (Bokmal)"
+
+[STR_DESC_MODULE_LANGPACK_NB]
+en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_LANGPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RM]
+en-US = "Rhaeto-Romance"
+
+[STR_DESC_MODULE_LANGPACK_RM]
+en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_LANGPACK_RO]
+en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_LANGPACK_SQ]
+en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_LANGPACK_ID]
+en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_LANGPACK_UK]
+en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_LANGPACK_BE]
+en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_LANGPACK_SL]
+en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_LANGPACK_LV]
+en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_LANGPACK_LT]
+en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_LANGPACK_HY]
+en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_LANGPACK_EU]
+en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_LANGPACK_MK]
+en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MT]
+en-US = "Maltese"
+
+[STR_DESC_MODULE_LANGPACK_MT]
+en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_LANGPACK_CY]
+en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_LANGPACK_GL]
+en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH_YU]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH_YU]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_LANGPACK_GA]
+en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR_CS]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR_CS]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_LANGPACK_BS]
+en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AS_IN]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_LANGPACK_AS_IN]
+en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_LANGPACK_RW]
+en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SA]
+en-US = "Sanskrit"
+
+[STR_DESC_MODULE_LANGPACK_SA]
+en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FA]
+en-US = "Farsi"
+
+[STR_DESC_MODULE_LANGPACK_FA]
+en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FO]
+en-US = "Faroese"
+
+[STR_DESC_MODULE_LANGPACK_FO]
+en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SB]
+en-US = "Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_SB]
+en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_LANGPACK_TT]
+en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_LANGPACK_TS]
+en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_YI]
+en-US = "Yiddish"
+
+[STR_DESC_MODULE_LANGPACK_YI]
+en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_LANGPACK_BR]
+en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_LANGPACK_NR]
+en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_LANGPACK_SS]
+en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_LANGPACK_VE]
+en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_LANGPACK_KN]
+en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MS]
+en-US = "Malay (Malaysian)"
+
+[STR_DESC_MODULE_LANGPACK_MS]
+en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_LANGPACK_TG]
+en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_LANGPACK_KU]
+en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_LANGPACK_DZ]
+en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_LANGPACK_KA]
+en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_LANGPACK_EO]
+en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_LANGPACK_EN_ZA]
+en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_LANGPACK_EN_GB]
+en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR_IN]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR_IN]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ML_IN]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML_IN]
+en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TE_IN]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE_IN]
+en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TI_ER]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_LANGPACK_TI_ER]
+en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_LANGPACK_UZ]
+en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_LANGPACK_MN]
+en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
+
diff --git a/scp2/source/activex/file_activex.scp b/scp2/source/activex/file_activex.scp
index 574657b5b441..db9b028def62 100644
--- a/scp2/source/activex/file_activex.scp
+++ b/scp2/source/activex/file_activex.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 File gid_File_Lib_Soactivex
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -58,3 +60,4 @@ File gid_File_Lib_Regpatchactivex_Msi
     Name = "regpatchactivex.dll";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
diff --git a/scp2/source/activex/module_activex.scp b/scp2/source/activex/module_activex.scp
index 808afa874992..aaac49d8012d 100644
--- a/scp2/source/activex/module_activex.scp
+++ b/scp2/source/activex/module_activex.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 Module gid_Module_Optional_Activexcontrol
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC ( MODULE_OPTIONAL_ACTIVEXCONTROL );
@@ -36,3 +38,5 @@ Module gid_Module_Optional_Activexcontrol
     ParentID = gid_Module_Optional;
     Files = (gid_File_Lib_Soactivex, gid_File_Lib_Soactivex64, gid_File_Lib_Regactivex_Msi, gid_File_Lib_Regpatchactivex_Msi);
 End
+
+#endif // WITH_ACTIVEX_COMPONENT
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 9c0f2d5aca8f..01e0b7f94d2a 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -74,7 +74,7 @@ STD_LIB_FILE( gid_File_Lib_Rptxml, rptxml )
 
 File gid_File_Help_Sdatabase_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdatabase);
     Patchfiles = (); 
 End
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index dc4d76fcf5d1..1a245a657e6c 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -54,15 +54,6 @@ Module gid_Module_Prg_Base_Bin
     );
 End
 
-// Module gid_Module_Prg_Base_Help
-//     MOD_NAME_DESC ( MODULE_PRG_BASE_HELP );
-//     ParentID = gid_Module_Prg_Base;
-//     Sortkey = "200";
-//     Minimal = NO;
-//     Default = YES;
-//     Files = (gid_File_Help_Sdatabase_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Base
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Base";
@@ -81,8 +72,7 @@ Module gid_Module_Langpack_Base_Template
     Name = "gid_Module_Langpack_Base_Template";
     Description = "gid_Module_Langpack_Base_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Sdatabase_Zip,
-             gid_File_Res_Abp,
+    Files = (gid_File_Res_Abp,
              gid_File_Res_Adabasui,
              gid_File_Res_Cnr,
              gid_File_Res_Dbp,
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 833ed3905241..833ed3905241 100755..100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
diff --git a/scp2/source/calc/file_calc.scp b/scp2/source/calc/file_calc.scp
index 59d7a5aac90e..b1fd14b4088a 100644
--- a/scp2/source/calc/file_calc.scp
+++ b/scp2/source/calc/file_calc.scp
@@ -53,7 +53,7 @@ STD_LIB_FILE( gid_File_Lib_Sc, sc)
 
 STD_LIB_FILE( gid_File_Lib_Scui, scui)
 
-STD_LIB_FILE( gid_File_Lib_Scfilt, scfilt)
+STD_FILTER_FILE( gid_File_Lib_Scfilt, scfilt)
 
 STD_LIB_FILE( gid_File_Lib_Scd, scd)
 
@@ -67,7 +67,7 @@ STD_RES_FILE( gid_File_Res_Sc, sc )
 
 File gid_File_Help_Scalc_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(scalc);
     Patchfiles = ();
 End
diff --git a/scp2/source/calc/module_calc.scp b/scp2/source/calc/module_calc.scp
index 0c26c3a7a78b..0e5e7903e39a 100644
--- a/scp2/source/calc/module_calc.scp
+++ b/scp2/source/calc/module_calc.scp
@@ -47,14 +47,6 @@ Module gid_Module_Prg_Calc_Bin
     gid_File_Tmp_Userinstall_Calc_Inf);
 End
 
-// Module gid_Module_Prg_Calc_Help
-//    MOD_NAME_DESC ( MODULE_PRG_CALC_HELP );
-//    ParentID = gid_Module_Prg_Calc;
-//    Sortkey = "200";
-//    Default = YES;
-//    Files = (gid_File_Help_Scalc_Zip);
-// End
-
 Module gid_Module_Prg_Calc_Addins
     MOD_NAME_DESC ( MODULE_OPTIONAL_ADDINS );
     Styles = (HIDDEN_ROOT);
@@ -82,8 +74,7 @@ Module gid_Module_Langpack_Calc_Template
     Name = "gid_Module_Langpack_Calc_Template";
     Description = "gid_Module_Langpack_Calc_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Scalc_Zip,
-             gid_File_Res_Analysis,
+    Files = (gid_File_Res_Analysis,
              gid_File_Res_Date,
              gid_File_Res_Sc,
              gid_File_Res_Solver);
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index a4708523640f..8220610ec5c3 100755..100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__7b342dc4_139a_4a46_8a93_Db0827ccee9c_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -265,6 +267,8 @@ RegistryItem gid_Regitem_Clsid__7fa8ae11_B3e3_4d88_Aabf_255526cd1ce8__Versionind
     Value = "opendocument.CalcDocument.1";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -272,6 +276,8 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6
     REG_VALUE_LNG(SO60_SPREADSHEET)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -279,6 +285,8 @@ RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Clsid
     Value = "{7B342DC4-139A-4a46-8A93-DB0827CCEE9C}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -639,6 +647,8 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1
     REG_VALUE_LNG(OO_CALC)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -646,6 +656,8 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Clsid
     Value = "{7FA8AE11-B3E3-4D88-AABF-255526CD1CE8}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Calc_Bin;
@@ -738,6 +750,53 @@ RegistryItem gid_Regitem_Openoffice_Calcdocument_1_Shell_Printto_Command
     Value = "\"<progpath>\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
+// .fods
+
+RegistryItem gid_Regitem_Fods_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".fods\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Fods_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".fods\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Fods_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".fods\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem__Fods
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".fods";
+    Value = "opendocument.CalcDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fods
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".fods";
+    Value = "opendocument.CalcDocument.1";
+    Styles = (PATCH);
+End
+
+RegistryItem gid_Regitem_Fods_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Calc_Bin;
+    Subkey = ".fods";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.spreadsheet";
+End
+
 // new ots file extension 
 
 RegistryItem gid_Regitem_Ots_PersistentHandler
diff --git a/scp2/source/canvas/canvascommons.scp b/scp2/source/canvas/canvascommons.scp
index 9788a90c7f3a..cd2dc9c2d6ea 100644
--- a/scp2/source/canvas/canvascommons.scp
+++ b/scp2/source/canvas/canvascommons.scp
@@ -30,11 +30,5 @@
 STD_LIB_FILE(gid_File_Lib_CppCanvas, cppcanvas)
 STD_LIB_FILE(gid_File_Lib_CanvasTools, canvastools)
 
-#ifdef ENABLE_AGG
-#ifndef SYSTEM_AGG
-STD_LIB_FILE(gid_File_Lib_Agg, agg)
-#endif
-#endif
-
 SPECIAL_COMPONENT_LIB_FILE(gid_File_CanvasFactory, canvasfactory.uno)
 SPECIAL_COMPONENT_LIB_FILE(gid_File_SimpleCanvas, simplecanvas.uno)
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index eaffb93f3e0f..1e360bed89bf 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -39,15 +39,9 @@ TARGETTYPE=CUI
 
 SCP_PRODUCT_TYPE=osl
 
-.IF "$(ENABLE_AGG)" == "YES"
-SCPDEFS+=-DENABLE_AGG
-.IF "$(SYSTEM_AGG)" == "YES"
-SCPDEFS+=-DSYSTEM_AGG
-.ENDIF
-.ENDIF
-
 PARFILES= canvascommons.par		\
-          vclcanvas.par
+          vclcanvas.par         \
+          mtfrenderer.par
 
 .IF "$(ENABLE_CAIRO_CANVAS)" == "TRUE"
 PARFILES+= cairocanvas.par
diff --git a/scp2/source/canvas/mtfrenderer.scp b/scp2/source/canvas/mtfrenderer.scp
new file mode 100644
index 000000000000..fa2a3f908a49
--- /dev/null
+++ b/scp2/source/canvas/mtfrenderer.scp
@@ -0,0 +1,40 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2010 Novell, Inc.
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+File gid_File_Lib_MtfRenderer
+    TXT_FILE_BODY;
+    Styles = (PACKED,UNO_COMPONENT);
+    RegistryID = gid_Starregistry_Services_Rdb;
+    Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+    Name = STRING(CONCAT2(libmtfrenderer.uno,UNXSUFFIX));
+  #else
+    Name = "mtfrenderer.uno.dll";
+  #endif
+End
diff --git a/scp2/source/draw/file_draw.scp b/scp2/source/draw/file_draw.scp
index 357e01f3cc00..ed5aa45b6c78 100644
--- a/scp2/source/draw/file_draw.scp
+++ b/scp2/source/draw/file_draw.scp
@@ -36,7 +36,7 @@ End
 
 File gid_File_Help_Sdraw_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sdraw);
     Patchfiles = (); 
 End
diff --git a/scp2/source/draw/module_draw.scp b/scp2/source/draw/module_draw.scp
index 3226e08ea559..b5bec12dc7f8 100644
--- a/scp2/source/draw/module_draw.scp
+++ b/scp2/source/draw/module_draw.scp
@@ -47,14 +47,6 @@ Module gid_Module_Prg_Draw_Bin
     gid_File_Tmp_Userinstall_Draw_Inf);
 End
 
-// Module gid_Module_Prg_Draw_Help
-//     MOD_NAME_DESC ( MODULE_PRG_DRAW_HELP );
-//     ParentID = gid_Module_Prg_Draw;
-//     Sortkey = "200";
-//     Default = YES;
-//     Files = (gid_File_Help_Sdraw_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Draw
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Draw";
@@ -73,7 +65,7 @@ Module gid_Module_Langpack_Draw_Template
     Name = "gid_Module_Langpack_Draw_Template";
     Description = "gid_Module_Langpack_Draw_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Sdraw_Zip);
+    Files = ();
 End
 
 #include "alllangmodules_draw.inc"
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index 63dde34437a1..d722319649cd 100755..100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__41662fc2_0d57_4aff_Ab27_Ad2e12e7c273_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -265,7 +267,7 @@ RegistryItem gid_Regitem_Clsid__448bb771_Cfe2_47c4_Bcdf_1fbf378e202c__Versionind
     Value = "opendocument.DrawDocument.1";
 End
 
-
+#endif // WITH_ACTIVEX_COMPONENT
 
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -274,6 +276,8 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6
     REG_VALUE_LNG(SO60_DRAWING)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -281,6 +285,8 @@ RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Clsid
     Value = "{41662FC2-0D57-4aff-AB27-AD2E12E7C273}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -639,6 +645,8 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1
     REG_VALUE_LNG(OO_DRAW)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -646,6 +654,8 @@ RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Clsid
     Value = "{448BB771-CFE2-47C4-BCDF-1FBF378E202C}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Drawdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Draw_Bin;
@@ -738,6 +748,53 @@ RegistryItem gid_Regitem_Openoffice_Drawingdocument_1_Protocol_Stdfileediting_Ve
     Value = "&Open";
 End
 
+// .fodg
+
+RegistryItem gid_Regitem_Fodg_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".fodg\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Fodg_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".fodg\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Fodg_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".fodg\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem_Fodg_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".fodg";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.graphics";
+End
+
+RegistryItem gid_Regitem__Fodg
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Draw_Bin;
+    Subkey = ".fodg";
+    Value = "opendocument.DrawDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodg
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".fodg";
+    Value = "opendocument.DrawDocument.1";
+    Styles = (PATCH);
+End
+
 // new otg file extension 
 
 RegistryItem gid_Regitem_Otg_PersistentHandler
diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp
new file mode 100644
index 000000000000..a36885d3d47c
--- /dev/null
+++ b/scp2/source/extensions/directory_extensions.scp
@@ -0,0 +1,303 @@
+/*************************************************************************
+*
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: directory_extensions.scp,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+************************************************************************/
+
+#include "macros.inc"
+
+/* *** Additional Extensions *** */
+
+#ifdef WITH_EXTENSION_INTEGRATION
+
+/* ** Presentation Minimizer ** */
+
+#ifndef WITHOUT_EXTENSION_MINIMIZER
+
+Directory gid_Brand_Dir_Share_Extensions_Presentation_Minimizer
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "presentation-minimizer";
+End
+
+#endif
+
+/* ** Report Builder ** */
+
+#ifndef WITHOUT_EXTENSION_REPORTDESIGN
+
+Directory gid_Brand_Dir_Share_Extensions_Report_Builder
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "report-builder";
+End
+
+#endif
+
+/* ** MediaWiki Publisher** */
+
+#ifndef WITHOUT_EXTENSION_MEDIAWIKI
+
+Directory gid_Brand_Dir_Share_Extensions_MediaWiki
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "wiki-publisher";
+End
+
+#endif
+
+/* ** Presenter Screen ** */
+
+#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
+
+Directory gid_Brand_Dir_Share_Extensions_Presenter_Screen
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "presenter-screen";
+End
+
+#endif
+
+/* ** PDF Import ** */
+
+#ifndef WITHOUT_EXTENSION_PDFIMPORT
+
+Directory gid_Brand_Dir_Share_Extensions_PDF_Import
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "pdfimport";
+End
+
+#endif
+
+/* ** Lightproof ** */
+
+#ifdef WITH_EXTENSION_LIGHTPROOF
+
+Directory gid_Brand_Dir_Share_Extensions_LightProof
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName (en-US) = "lightproof-en-US-0.1";
+    DosName (hu) = "lightproof-hu-1.2";
+    DosName = "lightproof";
+End
+
+#endif
+
+/* ** Numbertext ** */
+
+#ifdef WITH_EXTENSION_NUMBERTEXT
+
+Directory gid_Brand_Dir_Share_Extensions_NumberText
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "numbertext";
+End
+
+#endif
+
+/* ** ConvertTextToNumber ** */
+
+#ifdef WITH_EXTENSION_CT2N
+
+Directory gid_Brand_Dir_Share_Extensions_CT2N
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "ConvertTextToNumber";
+End
+
+#endif
+
+/* ** Hungarian Cross-reference Toolbar** */
+
+#ifdef WITH_EXTENSION_HUNART
+
+Directory gid_Brand_Dir_Share_Extensions_HunArt
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "hunart";
+End
+
+#endif
+
+/* ** Typography Toolbar** */
+
+#ifdef WITH_EXTENSION_TYPO
+
+Directory gid_Brand_Dir_Share_Extensions_Typo
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "typo";
+End
+
+#endif
+
+/* ** Watch Window ** */
+
+#ifdef WITH_EXTENSION_WATCH_WINDOW
+
+Directory gid_Brand_Dir_Share_Extensions_Watch_Window
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "WatchWindow";
+End
+
+#endif
+
+/* ** Diagram ** */
+
+#ifdef WITH_EXTENSION_DIAGRAM
+
+Directory gid_Brand_Dir_Share_Extensions_Diagram
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "Diagram";
+End
+
+#endif
+
+/* ** Validator ** */
+
+#ifdef WITH_EXTENSION_VALIDATOR
+
+Directory gid_Brand_Dir_Share_Extensions_Validator
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "Validator";
+End
+
+#endif
+
+/* ** Barcode ** */
+
+#ifdef WITH_EXTENSION_BARCODE
+
+Directory gid_Brand_Dir_Share_Extensions_Barcode
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "Barcode";
+End
+
+#endif
+
+/* ** Google Docs ** */
+
+#ifdef WITH_EXTENSION_GOOGLE_DOCS
+
+Directory gid_Brand_Dir_Share_Extensions_Google_Docs
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "gdocs";
+End
+
+#endif
+
+/* ** NLPSolver ** */
+
+#ifdef WITH_EXTENSION_NLPSOLVER
+
+Directory gid_Brand_Dir_Share_Extensions_NLPSolver
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "NLPSolver";
+End
+
+#endif
+
+/* ** LanguageTool ** */
+
+#ifdef WITH_EXTENSION_LANGUAGETOOL
+
+Directory gid_Brand_Dir_Share_Extensions_LanguageTool
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "LanguageTool";
+End
+
+#endif
+
+/* ** MySQL Connector ** */
+
+#ifdef WITH_EXTENSION_MYSQLC
+
+Directory gid_Brand_Dir_Share_Extensions_MySQLConnector
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "mysql-connector-ooo";
+End
+
+#endif
+
+/* ** oooblogger ** */
+
+#ifdef WITH_EXTENSION_OOOBLOGGER
+
+Directory gid_Brand_Dir_Share_Extensions_OOoBlogger
+	ParentID = gid_Brand_Dir_Share_Extensions;
+	DosName = "oooblogger";
+End
+
+#endif
+
+/* ** Sun Template Pack ** */
+
+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
+
+Directory gid_Brand_Dir_Share_Extensions_Sun_Template_Pack
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName (en-US) = "Sun_ODF_Template_Pack_en-US";
+    DosName (de) = "Sun_ODF_Template_Pack_de";
+    DosName (es) = "Sun_ODF_Template_Pack_es";
+    DosName (fr) = "Sun_ODF_Template_Pack_fr";
+    DosName (hu) = "Sun_ODF_Template_Pack_hu";
+    DosName (it) = "Sun_ODF_Template_Pack_it";
+    DosName = "Sun_ODF_Template_Pack";
+End
+
+#endif
+
+/* ** Script provider for BeanShell ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "script-provider-for-beanshell";
+End
+
+#endif
+
+/* ** Script provider for JavaScript ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "script-provider-for-javascript";
+End
+
+#endif
+
+/* ** Script provider for Python ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON
+
+Directory gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "script-provider-for-python";
+End
+
+#endif
+
+#endif
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
new file mode 100644
index 000000000000..a2b48ecbac26
--- /dev/null
+++ b/scp2/source/extensions/file_extensions.scp
@@ -0,0 +1,347 @@
+/*************************************************************************
+*
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: file_extensions.scp,v $
+ *
+ *  $Revision: 1.4 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+************************************************************************/
+
+#include "macros.inc"
+
+/* *** Additional Extensions *** */
+
+#ifdef WITH_EXTENSION_INTEGRATION
+
+/* ** Presentation Minimizer ** */
+
+#ifndef WITHOUT_EXTENSION_MINIMIZER
+
+File gid_File_Oxt_Presentation_Minimizer
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Presentation_Minimizer;
+    Name = "presentation-minimizer.oxt";
+End
+
+#endif
+
+/* ** Report Builder ** */
+
+#ifndef WITHOUT_EXTENSION_REPORTDESIGN
+
+File gid_File_Oxt_Report_Builder
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Report_Builder;
+    Name = "report-builder.oxt";
+End
+
+#endif
+
+/* ** MediaWiki Publisher** */
+
+#ifndef WITHOUT_EXTENSION_MEDIAWIKI
+
+File gid_File_Oxt_MediaWiki
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_MediaWiki;
+    Name = "wiki-publisher.oxt";
+End
+
+#endif
+
+/* ** Presenter Screen ** */
+
+#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
+
+File gid_File_Oxt_Presenter_Screen
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Presenter_Screen;
+    Name = "presenter-screen.oxt";
+End
+
+#endif
+
+/* ** PDF Import ** */
+
+#ifndef WITHOUT_EXTENSION_PDFIMPORT
+
+File gid_File_Oxt_PDF_Import
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_PDF_Import;
+    Name = "pdfimport.oxt";
+End
+
+#endif
+
+/* ** Lightproof ** */
+
+#ifdef WITH_EXTENSION_LIGHTPROOF
+
+File gid_File_Oxt_LightProof
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_LightProof;
+    Name (en-US) = "lightproof-en-US.oxt";
+    Name (hu) = "lightproof-hu.oxt";
+End
+
+#endif
+
+/* ** Numbertext ** */
+
+#ifdef WITH_EXTENSION_NUMBERTEXT
+
+File gid_File_Oxt_NumberText
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_NumberText;
+    Name = "numbertext.oxt";
+End
+
+#endif
+
+/* ** ConvertTextToNumber ** */
+
+#ifdef WITH_EXTENSION_CT2N
+
+File gid_File_Oxt_CT2N
+	TXT_FILE_BODY;
+	Styles = (PACKED, ARCHIVE);
+	Dir = gid_Brand_Dir_Share_Extensions_CT2N;
+	Name = "ConvertTextToNumber.oxt";
+End
+
+#endif
+
+/* ** Hungarian Cross-reference Toolbar** */
+
+#ifdef WITH_EXTENSION_HUNART
+
+File gid_File_Oxt_HunArt
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_HunArt;
+    Name = "hunart.oxt";
+End
+
+#endif
+
+/* ** Typography Toolbar** */
+
+#ifdef WITH_EXTENSION_TYPO
+
+File gid_File_Oxt_Typo
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Typo;
+    Name = "typo.oxt";
+End
+
+#endif
+
+/* ** Watch Window ** */
+
+#ifdef WITH_EXTENSION_WATCH_WINDOW
+
+File gid_File_Oxt_Watch_Window
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Watch_Window;
+    Name = "WatchWindow.oxt";
+End
+
+#endif
+
+/* ** Diagram ** */
+
+#ifdef WITH_EXTENSION_DIAGRAM
+
+File gid_File_Oxt_Diagram
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Diagram;
+    Name = "Diagram.oxt";
+End
+
+#endif
+
+/* ** Validator ** */
+
+#ifdef WITH_EXTENSION_VALIDATOR
+
+File gid_File_Oxt_Validator
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Validator;
+    Name = "Validator.oxt";
+End
+
+#endif
+
+/* ** Barcode ** */
+
+#ifdef WITH_EXTENSION_BARCODE
+
+File gid_File_Oxt_Barcode
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Barcode;
+    Name = "Barcode.oxt";
+End
+
+#endif
+
+/* ** Google Docs ** */
+
+#ifdef WITH_EXTENSION_GOOGLE_DOCS
+
+File gid_File_Oxt_Google_Docs
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Google_Docs;
+    Name = "gdocs.oxt";
+End
+
+#endif
+
+/* ** NLPSolver ** */
+
+#ifdef WITH_EXTENSION_NLPSOLVER
+
+File gid_File_Oxt_NLPSolver
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_NLPSolver;
+    Name = "NLPSolver.oxt";
+End
+
+#endif
+
+/* ** LanguageTool ** */
+
+#ifdef WITH_EXTENSION_LANGUAGETOOL
+
+File gid_File_Oxt_LanguageTool
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_LanguageTool;
+    Name = "LanguageTool.oxt";
+End
+
+#endif
+
+/* ** MySQL Connector ** */
+
+#ifdef WITH_EXTENSION_MYSQLC
+
+File gid_File_Oxt_MySQLConnector
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_MySQLConnector;
+    Name = "mysql-connector-ooo.oxt";
+End
+
+#endif
+
+/* ** oooblogger ** */
+
+#ifdef WITH_EXTENSION_OOOBLOGGER
+
+File gid_File_Oxt_OOoBlogger
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_OOoBlogger;
+    Name = "oooblogger.oxt";
+End
+
+#endif
+
+/* ** Sun Template Pack ** */
+
+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
+
+File gid_File_Optional_Extensions_Sun_Template_Pack
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Sun_Template_Pack;
+    Name (en-US) = "Sun-ODF-Template-Pack-en-US.oxt";
+    Name (de) = "Sun-ODF-Template-Pack-de.oxt";
+    Name (it) = "Sun-ODF-Template-Pack-it.oxt";
+    Name (fr) = "Sun-ODF-Template-Pack-fr.oxt";
+    Name (es) = "Sun-ODF-Template-Pack-es.oxt";
+    Name (hu) = "Sun-ODF-Template-Pack-hu.oxt";
+End
+
+#endif
+
+/* ** Script provider for BeanShell ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+
+File gid_File_Oxt_Script_Provider_For_Beanshell
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Beanshell;
+    Name = "script-provider-for-beanshell.oxt";
+End
+
+#endif
+
+/* ** Script provider for JavaScript ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+
+File gid_File_Oxt_Script_Provider_For_Javascript
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Javascript;
+    Name = "script-provider-for-javascript.oxt";
+End
+
+#endif
+
+/* ** Script provider for Python ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON
+
+File gid_File_Oxt_Script_Provider_For_Python
+    TXT_FILE_BODY;
+    Styles = (PACKED, ARCHIVE);
+    Dir = gid_Brand_Dir_Share_Extensions_Script_Provider_For_Python;
+    Name = "script-provider-for-python.oxt";
+End
+
+#endif
+
+#endif
diff --git a/scp2/source/extensions/makefile.mk b/scp2/source/extensions/makefile.mk
new file mode 100644
index 000000000000..fef302b2e46c
--- /dev/null
+++ b/scp2/source/extensions/makefile.mk
@@ -0,0 +1,62 @@
+#*************************************************************************
+#
+#  OpenOffice.org - a multi-platform office productivity suite
+#
+#  $RCSfile: makefile.mk,v $
+#
+#  $Revision: 1.1 $
+#
+#  last change: $Author: KAMI $ $Date: 2010/08/12 22:05:54 $
+#
+#  The Contents of this file are made available subject to
+#  the terms of GNU Lesser General Public License Version 3.
+#
+#
+#    GNU Lesser General Public License Version 3
+#    =============================================
+#    Copyright 2005 by Sun Microsystems, Inc.
+#    901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#    This library is free software; you can redistribute it and/or
+#    modify it under the terms of the GNU Lesser General Public
+#    License version 2.1, as published by the Free Software Foundation.
+#
+#    This library 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 for more details.
+#
+#    You should have received a copy of the GNU Lesser General Public
+#    License along with this library; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#    MA  02111-1307  USA
+#
+#*************************************************************************
+
+PRJ=..$/..
+
+PRJPCH=
+
+PRJNAME=scp2
+TARGET=extensions
+TARGETTYPE=CUI
+
+#--- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+SCP_PRODUCT_TYPE=osl
+PARFILES= \
+        module_extensions.par                        \
+        module_extensions_sun_templates.par          \
+        module_extensions_lightproof.par             \
+        directory_extensions.par                     \
+        file_extensions.par
+
+ULFFILES= \
+        module_extensions.ulf                        \
+        module_extensions_sun_templates.ulf          \
+        module_extensions_lightproof.ulf
+
+#--- File ---------------------------------------------------------
+.INCLUDE :  target.mk
diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp
new file mode 100644
index 000000000000..568b2e1eca7a
--- /dev/null
+++ b/scp2/source/extensions/module_extensions.scp
@@ -0,0 +1,397 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_accessories.scp,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Extensions
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS);
+    ParentID = gid_Module_Optional;
+    Files = ( );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+/* *** Additional Extensions *** */
+
+#ifdef WITH_EXTENSION_INTEGRATION
+
+/* ** Presentation Minimizer ** */
+
+#ifndef WITHOUT_EXTENSION_MINIMIZER
+Module gid_Module_Optional_Extensions_MINIMIZER
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MINIMIZER);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Presentation_Minimizer );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Report Builder ** */
+
+#ifndef WITHOUT_EXTENSION_REPORTDESIGN
+Module gid_Module_Optional_Extensions_REPORTDESIGN
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Report_Builder );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** MediaWiki Publisher** */
+
+#ifndef WITHOUT_EXTENSION_MEDIAWIKI
+Module gid_Module_Optional_Extensions_MEDIAWIKI
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_MediaWiki );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Presenter Screen ** */
+
+#ifndef WITHOUT_EXTENSION_PRESENTER_SCREEN
+Module gid_Module_Optional_Extensions_PRESENTER_SCREEN
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Presenter_Screen );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** PDF Import ** */
+
+#ifndef WITHOUT_EXTENSION_PDFIMPORT
+Module gid_Module_Optional_Extensions_PDFIMPORT
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_PDF_Import );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Lightproof ** */
+
+#ifdef WITH_EXTENSION_LIGHTPROOF
+Module gid_Module_Optional_Extensions_LightProof
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF);
+    ParentID = gid_Module_Optional_Extensions;
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
+
+/* ** Numbertext ** */
+
+#ifdef WITH_EXTENSION_NUMBERTEXT
+Module gid_Module_Optional_Extensions_NumberText
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_NumberText );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Hungarian Cross-reference Toolbar ** */
+
+#ifdef WITH_EXTENSION_HUNART
+Module gid_Module_Optional_Extensions_HunArt
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_HUNART);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_HunArt );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Typography Toolbar ** */
+
+#ifdef WITH_EXTENSION_TYPO
+Module gid_Module_Optional_Extensions_Typo
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_TYPO);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Typo );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** ConvertTextToNumber ** */
+
+#ifdef WITH_EXTENSION_CT2N
+Module gid_Module_Optional_Extensions_CT2N
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_CT2N);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_CT2N );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Watch Window ** */
+
+#ifdef WITH_EXTENSION_WATCH_WINDOW
+Module gid_Module_Optional_Extensions_Watch_Window
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Watch_Window );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Diagram ** */
+
+#ifdef WITH_EXTENSION_DIAGRAM
+Module gid_Module_Optional_Extensions_Diagram
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_DIAGRAM);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Diagram );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Validator ** */
+
+#ifdef WITH_EXTENSION_VALIDATOR
+Module gid_Module_Optional_Extensions_Validator
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_VALIDATOR);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Validator );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Barcode ** */
+
+#ifdef WITH_EXTENSION_BARCODE
+Module gid_Module_Optional_Extensions_Barcode
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_BARCODE);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Barcode );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Google Docs ** */
+
+#ifdef WITH_EXTENSION_GOOGLE_DOCS
+Module gid_Module_Optional_Extensions_Google_Docs
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Google_Docs );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** NLPSolver ** */
+
+#ifdef WITH_EXTENSION_NLPSOLVER
+Module gid_Module_Optional_Extensions_NLPSolver
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_NLPSolver );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** LanguageTool ** */
+
+#ifdef WITH_EXTENSION_LANGUAGETOOL
+Module gid_Module_Optional_Extensions_LanguageTool
+ PackageInfo = "packinfo_extensions.txt";
+ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL);
+ ParentID = gid_Module_Optional_Extensions;
+ Files = (
+ gid_File_Oxt_LanguageTool );
+ Minimal = NO;
+ Default = YES;
+ Styles = ( );
+End
+#endif
+
+/* ** MySQL Connector ** */
+
+#ifdef WITH_EXTENSION_MYSQLC
+Module gid_Module_Optional_Extensions_MySQLConnector
+ PackageInfo = "packinfo_extensions.txt";
+ MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_MYSQLC);
+ ParentID = gid_Module_Optional_Extensions;
+ Files = (
+ gid_File_Oxt_MySQLConnector );
+ Minimal = NO;
+ Default = YES;
+ Styles = ( );
+End
+#endif
+
+/* ** oooblogger ** */
+
+#ifdef WITH_EXTENSION_OOOBLOGGER
+Module gid_Module_Optional_Extensions_OOoBlogger
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_OOoBlogger );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Sun Template Pack ** */
+
+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
+Module gid_Module_Optional_Extensions_Sun_Template_Pack
+    ParentID = gid_Module_Optional_Extensions;
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK);
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+#endif
+
+/* ** Script provider for BeanShell ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_BEANSHELL
+
+Module gid_Module_Optional_Extensions_Script_Provider_For_Beanshell
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Script_Provider_For_Beanshell );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
+
+/* ** Script provider for JavaScript ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_JAVASCRIPT
+
+Module gid_Module_Optional_Extensions_Script_Provider_For_Javascript
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Script_Provider_For_Javascript );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
+
+/* ** Script provider for Python ** */
+
+#ifndef WITHOUT_EXTENSION_SCRIPTING_PYTHON
+
+Module gid_Module_Optional_Extensions_Script_Provider_For_Python
+    PackageInfo = "packinfo_extensions.txt";
+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON);
+    ParentID = gid_Module_Optional_Extensions;
+    Files = (
+        gid_File_Oxt_Script_Provider_For_Python );
+    Minimal = NO;
+    Default = YES;
+    Styles = ( );
+End
+
+#endif
+
+#endif
diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf
new file mode 100644
index 000000000000..73c91d699ac9
--- /dev/null
+++ b/scp2/source/extensions/module_extensions.ulf
@@ -0,0 +1,178 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_accessories.ulf,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2010/10/31 04:58:10 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS]
+en-US = "Extensions"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS]
+en-US = "Useful %PRODUCTNAME extensions."
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
+en-US = "Presentation Minimizer"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MINIMIZER]
+en-US = "Presentation Minimizer"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
+en-US = "Report Builder"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_REPORTDESIGN]
+en-US = "Report Builder"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
+en-US = "MediaWiki Publisher"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MEDIAWIKI]
+en-US = "MediaWiki Publisher"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN]
+en-US = "Presenter Screen"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PRESENTER_SCREEN]
+en-US = "Presenter Screen"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
+en-US = "PDF Import"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_PDFIMPORT]
+en-US = "PDF Import"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF]
+en-US = "Lightproof"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LIGHTPROOF]
+en-US = "Lightproof"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
+en-US = "Numbertext"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NUMBERTEXT]
+en-US = "Numbertext"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_HUNART]
+en-US = "Hungarian cross-reference toolbar"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_HUNART]
+en-US = "Toolbar to add cross-references with automatic conditional Hungarian articles (eg. *az* 5. ábra, *a* 6. ábra) to avoid bad article and number combination in cross-references."
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_TYPO]
+en-US = "Typography toolbar"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_TYPO]
+en-US = "Toolbar for Graphite smart font features: ligatures, small caps, old style numbers, proportional or monospaced numbers, automatic thousand separators, minus sign, real superscript and subscript, German umlaut variants, fractions."
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_CT2N]
+en-US = "Convert Text to Number"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_CT2N]
+en-US = "Convert Text to Number"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW]
+en-US = "Watch Window"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_WATCH_WINDOW]
+en-US = "Watch Window"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM]
+en-US = "Diagram"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_DIAGRAM]
+en-US = "Diagram"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_VALIDATOR]
+en-US = "Validator"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_VALIDATOR]
+en-US = "Validator"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_BARCODE]
+en-US = "Barcode"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_BARCODE]
+en-US = "Barcode"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS]
+en-US = "Google Docs & Zoho"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_GOOGLE_DOCS]
+en-US = "Google Docs & Zoho"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER]
+en-US = "Solver for Nonlinear Programming"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_NLPSOLVER]
+en-US = "Solver for Nonlinear Programming"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL]
+en-US = "LanguageTool Open Source language checker"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_LANGUAGETOOL]
+en-US = "LanguageTool Open Source language checker"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_MYSQLC]
+en-US = "MySQL Connector"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_MYSQLC]
+en-US = "MySQL Connector"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
+en-US = "Metaweblog Support"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_OOOBLOGGER]
+en-US = "Metaweblog Support"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK]
+en-US = "Sun Professional Template Pack"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SUN_TEMPLATE_PACK]
+en-US = "Sun Professional Template Pack"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
+en-US = "Script provider for BeanShell"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_BEANSHELL]
+en-US = "Script provider for BeanShell"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
+en-US = "Script provider for JavaScript"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT]
+en-US = "Script provider for JavaScript"
+
+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON]
+en-US = "Script provider for Python"
+
+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON]
+en-US = "Script provider for Python"
diff --git a/scp2/source/extensions/module_extensions_lightproof.scp b/scp2/source/extensions/module_extensions_lightproof.scp
new file mode 100644
index 000000000000..58aa59ad17c4
--- /dev/null
+++ b/scp2/source/extensions/module_extensions_lightproof.scp
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_extensions_sun_templates.scp,v $
+ *
+ *  $Revision: 1.0 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+/* ** LightProof ** */
+
+#ifdef WITH_EXTENSION_INTEGRATION
+
+#ifdef WITH_EXTENSION_LIGHTPROOF
+
+Module gid_Module_Optional_Extensions_LightProof_Template
+    ParentID = gid_Module_Optional_Extensions_LightProof;
+    Name = "gid_Module_Optional_Extensions_LightProof_Template";
+    Description = "gid_Module_Optional_Extensions_LightProof_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = ( gid_File_Oxt_LightProof );
+    Minimal = NO;
+    Default = YES;
+End
+
+#include "alllangmodules_extensions_lightproof.inc"
+
+#endif
+
+#endif
diff --git a/scp2/source/extensions/module_extensions_lightproof.ulf b/scp2/source/extensions/module_extensions_lightproof.ulf
new file mode 100644
index 000000000000..b78fe12a00d7
--- /dev/null
+++ b/scp2/source/extensions/module_extensions_lightproof.ulf
@@ -0,0 +1,701 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_accessories.ulf,v $
+ *
+ *  $Revision: 1.0 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+
+[STR_NAME_MODULE_LANGPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_LANGPACK_EN_US]
+en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_LANGPACK_DE]
+en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_LANGPACK_FR]
+en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_LANGPACK_IT]
+en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_LANGPACK_ES]
+en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_LANGPACK_SV]
+en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_LANGPACK_PT]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_LANGPACK_PT_BR]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_LANGPACK_JA]
+en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_LANGPACK_KO]
+en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_LANGPACK_NL]
+en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_LANGPACK_HU]
+en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_LANGPACK_PL]
+en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_LANGPACK_RU]
+en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_LANGPACK_TR]
+en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_LANGPACK_EL]
+en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_LANGPACK_TH]
+en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_LANGPACK_CS]
+en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_LANGPACK_SK]
+en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_LANGPACK_HR]
+en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_LANGPACK_ET]
+en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_LANGPACK_VI]
+en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_LANGPACK_BG]
+en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_LANGPACK_KM]
+en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_LANGPACK_PA_IN]
+en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU_IN]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA_IN]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI_IN]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_LANGPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_LANGPACK_TN]
+en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_LANGPACK_XH]
+en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_LANGPACK_ZU]
+en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_LANGPACK_AF]
+en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW_TZ]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_LANGPACK_LO]
+en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_LANGPACK_NSO]
+en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_LANGPACK_BN]
+en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_BD]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_LANGPACK_BN_BD]
+en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_LANGPACK_BN_IN]
+en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR_IN]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR_IN]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR_IN]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR_IN]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_LANGPACK_NE]
+en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR_SA]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR_SA]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_LANGPACK_CA]
+en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_LANGPACK_DA]
+en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_LANGPACK_FI]
+en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_LANGPACK_HE]
+en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_LANGPACK_IS]
+en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NB]
+en-US = "Norwegian (Bokmal)"
+
+[STR_DESC_MODULE_LANGPACK_NB]
+en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_LANGPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RM]
+en-US = "Rhaeto-Romance"
+
+[STR_DESC_MODULE_LANGPACK_RM]
+en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_LANGPACK_RO]
+en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_LANGPACK_SQ]
+en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_LANGPACK_ID]
+en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_LANGPACK_UK]
+en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_LANGPACK_BE]
+en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_LANGPACK_SL]
+en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_LANGPACK_LV]
+en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_LANGPACK_LT]
+en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_LANGPACK_HY]
+en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_LANGPACK_EU]
+en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_LANGPACK_MK]
+en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MT]
+en-US = "Maltese"
+
+[STR_DESC_MODULE_LANGPACK_MT]
+en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_LANGPACK_CY]
+en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_LANGPACK_GL]
+en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH_YU]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH_YU]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_LANGPACK_GA]
+en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR_CS]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR_CS]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_LANGPACK_BS]
+en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AS_IN]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_LANGPACK_AS_IN]
+en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_LANGPACK_RW]
+en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SA]
+en-US = "Sanskrit"
+
+[STR_DESC_MODULE_LANGPACK_SA]
+en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FA]
+en-US = "Farsi"
+
+[STR_DESC_MODULE_LANGPACK_FA]
+en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FO]
+en-US = "Faroese"
+
+[STR_DESC_MODULE_LANGPACK_FO]
+en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SB]
+en-US = "Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_SB]
+en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_LANGPACK_TT]
+en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_LANGPACK_TS]
+en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_YI]
+en-US = "Yiddish"
+
+[STR_DESC_MODULE_LANGPACK_YI]
+en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_LANGPACK_BR]
+en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_LANGPACK_NR]
+en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_LANGPACK_SS]
+en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_LANGPACK_VE]
+en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_LANGPACK_KN]
+en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MS]
+en-US = "Malay (Malaysian)"
+
+[STR_DESC_MODULE_LANGPACK_MS]
+en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_LANGPACK_TG]
+en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_LANGPACK_KU]
+en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_LANGPACK_DZ]
+en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_LANGPACK_KA]
+en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_LANGPACK_EO]
+en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_LANGPACK_EN_ZA]
+en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_LANGPACK_EN_GB]
+en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR_IN]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR_IN]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ML_IN]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML_IN]
+en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TE_IN]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE_IN]
+en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TI_ER]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_LANGPACK_TI_ER]
+en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_LANGPACK_UZ]
+en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_LANGPACK_MN]
+en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scp2/source/extensions/module_extensions_sun_templates.scp b/scp2/source/extensions/module_extensions_sun_templates.scp
new file mode 100644
index 000000000000..6e5897ee58f4
--- /dev/null
+++ b/scp2/source/extensions/module_extensions_sun_templates.scp
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_extensions_sun_templates.scp,v $
+ *
+ *  $Revision: 1.0 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+/* ** Sun Template Pack ** */
+
+#ifdef WITH_EXTENSION_INTEGRATION
+
+#ifdef WITH_EXTENSION_SUN_TEMPLATE_PACK
+
+Module gid_Module_Optional_Extensions_Sun_T_Pack_Template
+    ParentID = gid_Module_Optional_Extensions_Sun_Template_Pack;
+    Name = "gid_Module_Optional_Extensions_Sun_T_Pack_Template";
+    Description = "gid_Module_Optional_Extensions_Sun_T_Pack_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = ( gid_File_Optional_Extensions_Sun_Template_Pack );
+    Minimal = NO;
+    Default = YES;
+End
+
+#include "alllangmodules_extensions_templates.inc"
+
+#endif
+
+#endif
diff --git a/scp2/source/extensions/module_extensions_sun_templates.ulf b/scp2/source/extensions/module_extensions_sun_templates.ulf
new file mode 100644
index 000000000000..b78fe12a00d7
--- /dev/null
+++ b/scp2/source/extensions/module_extensions_sun_templates.ulf
@@ -0,0 +1,701 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_accessories.ulf,v $
+ *
+ *  $Revision: 1.0 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+
+[STR_NAME_MODULE_LANGPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_LANGPACK_EN_US]
+en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_LANGPACK_DE]
+en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_LANGPACK_FR]
+en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_LANGPACK_IT]
+en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_LANGPACK_ES]
+en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_LANGPACK_SV]
+en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_LANGPACK_PT]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_LANGPACK_PT_BR]
+en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_LANGPACK_JA]
+en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_LANGPACK_KO]
+en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_LANGPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_LANGPACK_NL]
+en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_LANGPACK_HU]
+en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_LANGPACK_PL]
+en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_LANGPACK_RU]
+en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_LANGPACK_TR]
+en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_LANGPACK_EL]
+en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_LANGPACK_TH]
+en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_LANGPACK_CS]
+en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_LANGPACK_SK]
+en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_LANGPACK_HR]
+en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_LANGPACK_ET]
+en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_LANGPACK_VI]
+en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_LANGPACK_BG]
+en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_LANGPACK_KM]
+en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_LANGPACK_PA_IN]
+en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU_IN]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_LANGPACK_TA_IN]
+en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_LANGPACK_HI_IN]
+en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_LANGPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_LANGPACK_TN]
+en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_LANGPACK_XH]
+en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_LANGPACK_ZU]
+en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_LANGPACK_AF]
+en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_LANGPACK_SW_TZ]
+en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_LANGPACK_LO]
+en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_LANGPACK_NSO]
+en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_LANGPACK_BN]
+en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_BD]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_LANGPACK_BN_BD]
+en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_LANGPACK_BN_IN]
+en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OR_IN]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_LANGPACK_OR_IN]
+en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MR_IN]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_LANGPACK_MR_IN]
+en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_LANGPACK_NE]
+en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AR_SA]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_LANGPACK_AR_SA]
+en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_LANGPACK_CA]
+en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_LANGPACK_DA]
+en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_LANGPACK_FI]
+en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_LANGPACK_HE]
+en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_LANGPACK_IS]
+en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NB]
+en-US = "Norwegian (Bokmal)"
+
+[STR_DESC_MODULE_LANGPACK_NB]
+en-US = "Installs Norwegian (Bokmal) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_LANGPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RM]
+en-US = "Rhaeto-Romance"
+
+[STR_DESC_MODULE_LANGPACK_RM]
+en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_LANGPACK_RO]
+en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_LANGPACK_SQ]
+en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_LANGPACK_ID]
+en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_LANGPACK_UK]
+en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_LANGPACK_BE]
+en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_LANGPACK_SL]
+en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_LANGPACK_LV]
+en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_LANGPACK_LT]
+en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_LANGPACK_HY]
+en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_LANGPACK_EU]
+en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_LANGPACK_MK]
+en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MT]
+en-US = "Maltese"
+
+[STR_DESC_MODULE_LANGPACK_MT]
+en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_LANGPACK_CY]
+en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_LANGPACK_GL]
+en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH_YU]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH_YU]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_LANGPACK_SH]
+en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_LANGPACK_GA]
+en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR_CS]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR_CS]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_LANGPACK_SR]
+en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_LANGPACK_BS]
+en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AS_IN]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_LANGPACK_AS_IN]
+en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_LANGPACK_RW]
+en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SA]
+en-US = "Sanskrit"
+
+[STR_DESC_MODULE_LANGPACK_SA]
+en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FA]
+en-US = "Farsi"
+
+[STR_DESC_MODULE_LANGPACK_FA]
+en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_FO]
+en-US = "Faroese"
+
+[STR_DESC_MODULE_LANGPACK_FO]
+en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SB]
+en-US = "Sorbian"
+
+[STR_DESC_MODULE_LANGPACK_SB]
+en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_LANGPACK_TT]
+en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_LANGPACK_TS]
+en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_YI]
+en-US = "Yiddish"
+
+[STR_DESC_MODULE_LANGPACK_YI]
+en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_LANGPACK_BR]
+en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_LANGPACK_NR]
+en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_LANGPACK_SS]
+en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_LANGPACK_VE]
+en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_LANGPACK_KN]
+en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MS]
+en-US = "Malay (Malaysian)"
+
+[STR_DESC_MODULE_LANGPACK_MS]
+en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_LANGPACK_TG]
+en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_LANGPACK_KU]
+en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_LANGPACK_DZ]
+en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_LANGPACK_KA]
+en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_LANGPACK_EO]
+en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_LANGPACK_GU]
+en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_LANGPACK_EN_ZA]
+en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_LANGPACK_EN_GB]
+en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UR_IN]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_LANGPACK_UR_IN]
+en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_ML_IN]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML_IN]
+en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TE_IN]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE_IN]
+en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_TI_ER]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_LANGPACK_TI_ER]
+en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_LANGPACK_UZ]
+en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_LANGPACK_MN]
+en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp
index d48915072742..7cfd4556fc1a 100644
--- a/scp2/source/gnome/file_gnome.scp
+++ b/scp2/source/gnome/file_gnome.scp
@@ -61,3 +61,12 @@ File gid_File_Lib_Gconfbe
     Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX));
 End
 #endif
+
+#ifdef ENABLE_SYSTRAY_GTK
+File gid_File_Lib_QStart_Gtk
+    Name = LIBNAME(qstart_gtk);
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+End
+#endif
diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk
index 185915353a5a..43c2440695a9 100644
--- a/scp2/source/gnome/makefile.mk
+++ b/scp2/source/gnome/makefile.mk
@@ -39,6 +39,10 @@ TARGETTYPE=CUI
 
 SCP_PRODUCT_TYPE=osl
 
+.IF "$(ENABLE_SYSTRAY_GTK)" != ""
+SCPDEFS+=-DENABLE_SYSTRAY_GTK
+.ENDIF
+
 .IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!=""
 
 .IF "$(ENABLE_GCONF)" != ""
@@ -57,6 +61,10 @@ SCPDEFS+=-DENABLE_GNOMEVFS
 SCPDEFS+=-DENABLE_GIO
 .ENDIF
 
+.IF "$(ENABLE_GTK3)" != ""
+SCPDEFS+=-DENABLE_GTK3
+.ENDIF
+
 PARFILES =                   \
         module_gnome.par     \
         file_gnome.par
diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp
index f9df5c8969a1..8b84916172ac 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -41,6 +41,17 @@ Module gid_Module_Optional_Gnome
     XpdCheckSolaris = "SUNWgnome-vfs";
 #endif
     Files = (
+      gid_File_Lib_Evoab_2,
+      gid_File_Lib_Fps_Gnome,
+      gid_File_Lib_Vclplug_Gtk,
+#ifdef ENABLE_GTK3
+      gid_File_Lib_Vclplug_Gtk3,
+#endif
+      gid_File_Bin_Gnome_Open_Url,
+      gid_File_Bin_Gnome_Open_Url_Bin,
+#ifdef ENABLE_SYSTRAY_GTK
+      gid_File_Lib_QStart_Gtk,
+#endif
 #ifdef ENABLE_GNOMEVFS
       gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application,
 #endif
diff --git a/scp2/source/graphicfilter/file_graphicfilter.scp b/scp2/source/graphicfilter/file_graphicfilter.scp
index be1d35ed84cc..15a18d297421 100644
--- a/scp2/source/graphicfilter/file_graphicfilter.scp
+++ b/scp2/source/graphicfilter/file_graphicfilter.scp
@@ -38,3 +38,6 @@ STD_LIB_FILE( gid_File_Lib_Flash, flash )
 
 STD_LIB_FILE( gid_File_Lib_Svg, svgfilter )
 
+STD_FILTER_FILE( gid_File_Lib_WPGImport, wpgimport )
+
+STD_FILTER_FILE( gid_File_Lib_VisioImport, visioimport )
diff --git a/scp2/source/graphicfilter/module_graphicfilter.scp b/scp2/source/graphicfilter/module_graphicfilter.scp
index d5d99969fd64..5b6dffb7d14a 100644
--- a/scp2/source/graphicfilter/module_graphicfilter.scp
+++ b/scp2/source/graphicfilter/module_graphicfilter.scp
@@ -33,6 +33,6 @@ Module gid_Module_Optional_Grfflt
     Sortkey = "600";
     ParentID = gid_Module_Optional;
     Default = YES;
-    Files = (gid_File_Lib_Svg, gid_File_Lib_Flash,
+    Files = (gid_File_Lib_Svg, gid_File_Lib_Flash, gid_File_Lib_WPGImport,
     		 gid_File_Share_Registry_Graphicfilter_Xcd);
 End
diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 35f934da962e..850593d696a8 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -46,8 +46,7 @@ End
 
 File gid_File_Help_Simpress_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE,DONT_OVERWRITE);
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(simpress);
     Patchfiles = (); 
 End
diff --git a/scp2/source/impress/makefile.mk b/scp2/source/impress/makefile.mk
index 0a6e4c37ef1c..0a67e8608ab6 100644
--- a/scp2/source/impress/makefile.mk
+++ b/scp2/source/impress/makefile.mk
@@ -39,6 +39,10 @@ TARGETTYPE=CUI
 
 SCP_PRODUCT_TYPE=osl
 
+.IF "$(ENABLE_OPENGL)"=="TRUE"
+SCPDEFS+=-DENABLE_OPENGL
+.ENDIF
+
 PARFILES= \
         module_impress.par              \
         file_impress.par 
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index 1682b88d051f..e3313c821db4 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -44,18 +44,10 @@ Module gid_Module_Prg_Impress_Bin
     Styles = (HIDDEN_ROOT);
     Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
     gid_File_Share_Registry_Impress_Xcd,
-	gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
+    gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
     gid_File_Tmp_Userinstall_Impress_Inf);
 End
 
-// Module gid_Module_Prg_Impress_Help
-//     MOD_NAME_DESC ( MODULE_PRG_IMPRESS_HELP );
-//     ParentID = gid_Module_Prg_Impress;
-//     Sortkey = "200";
-//     Default = YES;
-//     Files = (gid_File_Help_Simpress_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Impress
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Impress";
@@ -74,7 +66,7 @@ Module gid_Module_Langpack_Impress_Template
     Name = "gid_Module_Langpack_Impress_Template";
     Description = "gid_Module_Langpack_Impress_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Simpress_Zip);
+    Files = ();
 End
 
 Module gid_Module_Prg_Impress_MSO_Reg
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index 7b270e5aca30..063bcf91f4eb 100755..100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__E5a0b632_Dfba_4549_9346_E414da06e6f8_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -265,7 +267,7 @@ RegistryItem gid_Regitem_Clsid__Ee5d1ea4_D445_4289_B2fc_55fc93693917__Versionind
     Value = "opendocument.ImpressDocument.1";
 End
 
-
+#endif // WITH_ACTIVEX_COMPONENT
 
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -274,6 +276,8 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6
     REG_VALUE_LNG(SO60_PRESENT)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -281,6 +285,8 @@ RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Clsid
     Value = "{E5A0B632-DFBA-4549-9346-E414DA06E6F8}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -654,6 +660,8 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1
     REG_VALUE_LNG(OO_PRESENT)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -661,6 +669,8 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Clsid
     Value = "{EE5D1EA4-D445-4289-B2FC-55FC93693917}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Impress_Bin;
@@ -767,6 +777,53 @@ RegistryItem gid_Regitem_Openoffice_Impressdocument_1_Shell_Show_Command
     Value = "\"<progpath>\program\soffice.exe\" -show \"%1\"";
 End
 
+// .fodp
+
+RegistryItem gid_Regitem_Fodp_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".fodp\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Fodp_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".fodp\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Fodp_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".fodp\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem__Fodp
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".fodp";
+    Value = "opendocument.ImpressDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodp
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".fodp";
+    Value = "opendocument.ImpressDocument.1";
+    Styles = (PATCH);
+End
+
+RegistryItem gid_Regitem_Fodp_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Impress_Bin;
+    Subkey = ".fodp";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.presentation";
+End
+
 // new otp file extension
 
 RegistryItem gid_Regitem_Otp_PersistentHandler
diff --git a/scp2/source/math/file_math.scp b/scp2/source/math/file_math.scp
index 6ab010baaf31..c554296d4381 100644
--- a/scp2/source/math/file_math.scp
+++ b/scp2/source/math/file_math.scp
@@ -52,7 +52,7 @@ End
 
 File gid_File_Help_Smath_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(smath);
     Patchfiles = ();
 End
diff --git a/scp2/source/math/module_math.scp b/scp2/source/math/module_math.scp
index e9c084ba928d..960c3203ba6d 100644
--- a/scp2/source/math/module_math.scp
+++ b/scp2/source/math/module_math.scp
@@ -47,14 +47,6 @@ Module gid_Module_Prg_Math_Bin
     gid_File_Tmp_Userinstall_Math_Inf);
 End
 
-// Module gid_Module_Prg_Math_Help
-//     MOD_NAME_DESC ( MODULE_PRG_MATH_HELP );
-//     ParentID = gid_Module_Prg_Math;
-//     Sortkey = "200";
-//     Default = YES;
-//     Files = (gid_File_Help_Smath_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Math
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Math";
@@ -73,8 +65,7 @@ Module gid_Module_Langpack_Math_Template
     Name = "gid_Module_Langpack_Math_Template";
     Description = "gid_Module_Langpack_Math_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Smath_Zip,
-             gid_File_Res_Sm);
+    Files = (gid_File_Res_Sm);
 End
 
 #include "alllangmodules_math.inc"
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index b87e5b940356..b58e15e5265e 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -26,6 +26,8 @@
  ************************************************************************/
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__D0484de6_Aaee_468a_991f_8d4b0737b57a_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -264,7 +266,7 @@ RegistryItem gid_Regitem_Clsid__D2d59cd1_0a6a_4d36_Ae20_47817077d57c__Versionind
     Value = "opendocument.MathDocument.1";
 End
 
-
+#endif // WITH_ACTIVEX_COMPONENT
 
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -273,6 +275,8 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6
     REG_VALUE_LNG(SO60_FORMULA)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -280,6 +284,8 @@ RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Clsid
     Value = "{D0484DE6-AAEE-468a-991F-8D4B0737B57A}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starmathdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -523,6 +529,8 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1
     REG_VALUE_LNG(OO_FORMULA)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
@@ -530,6 +538,8 @@ RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Clsid
     Value = "{D2D59CD1-0A6A-4D36-AE20-47817077D57C}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Mathdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Math_Bin;
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7afdcd81e1ec..8e08d6980bd6 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -62,8 +62,8 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Bin_Unopkgcom,
              gid_Brand_File_Bin_Unopkgexe,
              gid_Brand_File_Bin_Unopkg,
-             gid_Brand_File_Bin_Msvcr71,
              gid_Brand_File_Bin_Libxml2,
+             gid_Brand_File_Bmp_Shell,
              gid_Brand_File_Bmp_IntroAbout,
              gid_Brand_File_C05_Zip_Faq,
              gid_Brand_File_C05_Zip_Register,
@@ -98,10 +98,13 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Share_Xdg_JavaFilter,
              gid_Brand_File_Share_Xdg_Math,
              gid_Brand_File_Share_Xdg_Printeradmin,
-//             gid_Brand_File_Share_Xdg_QStart,
+             gid_Brand_File_Share_Xdg_QStart,
              gid_Brand_File_Share_Xdg_StartCenter,
              gid_Brand_File_Share_Xdg_Writer,
-             gid_Brand_File_Txt_Package);
+             gid_Brand_File_Txt_Package,
+	     gid_License_Txt,
+	     git_License_Odt,
+	     gid_Credits_Odt);
     Unixlinks = (gid_Brand_Unixlink_BasisLink,
                  gid_Brand_Unixlink_Program,
                  gid_Brand_Unixlink_Unopkg,
@@ -116,34 +119,21 @@ Module gid_Module_Langpack_Brand_Template
     Description = "gid_Module_Langpack_Brand_Template";
     Styles = (TEMPLATEMODULE);
     InstallOrder = "1050";
-    Dirs = (gid_Brand_Dir_Help,
-            gid_Brand_Dir_Help_Isolanguage,
-            gid_Brand_Dir_License,
-            gid_Brand_Dir_Program,
-            gid_Brand_Dir_Resource,
-            gid_Brand_Dir_Readme,
-            gid_Brand_Dir_Share,
-            gid_Brand_Dir_Share_Readme);
-    Files = (gid_Brand_File_Res_About,
+    Dirs = (gid_Brand_Dir_Program,
+            gid_Brand_Dir_Program_Shell,
+            gid_Brand_Dir_Program_Resource,
+            gid_Brand_Dir_Readme);
+    Files = (gid_Brand_File_Res_Iso,
+             gid_Brand_File_Res_Ooo,
              gid_Brand_File_Res_Oirm,
              gid_Brand_File_Help_C05_Sdatabase_Zip,
              gid_Brand_File_Help_C05_Scalc_Zip,
              gid_Brand_File_Help_C05_Sdraw_Zip,
              gid_Brand_File_Help_C05_Swriter_Zip,
-             gid_Brand_File_License_License,
-             gid_Brand_File_License_License_Small,
-             gid_Brand_File_License_License_Html,
-             gid_Brand_File_License_License_Html_Small,
              gid_Brand_File_Readme_Readme,
-             gid_Brand_File_Readme_Readme_Html,
              gid_Brand_File_Share_Registry_Cjk_Xcd,
              gid_Brand_File_Share_Registry_Korea_Xcd,
-             gid_Brand_File_Txt_License,
-             gid_Brand_File_Txt_License_Small,
-             gid_Brand_File_Txt_License_Html,
-             gid_Brand_File_Txt_License_Html_Small,
-             gid_Brand_File_Txt_Readme,
-             gid_Brand_File_Txt_Readme_Html);
+             gid_Brand_File_Txt_Readme);
 End
 
 // Directories
@@ -158,27 +148,23 @@ Directory gid_Brand_Dir_Program
 #endif
 End
 
-Directory gid_Brand_Dir_Resource
+Directory gid_Brand_Dir_Program_Resource
     ParentID = gid_Brand_Dir_Program;
     DosName = "resource";
 End
 
-Directory gid_Brand_Dir_Readme
-#if defined MACOSX
-    ParentID = gid_Brand_Dir_BasisLink;
-#else
-    ParentID = gid_Dir_Brand_Root;
-#endif
-    DosName = "readmes";
+Directory gid_Brand_Dir_Program_Shell
+    ParentID = gid_Brand_Dir_Program;
+    DosName = "shell";
 End
 
-Directory gid_Brand_Dir_License
+Directory gid_Brand_Dir_Readme
 #if defined MACOSX
     ParentID = gid_Brand_Dir_BasisLink;
 #else
     ParentID = gid_Dir_Brand_Root;
 #endif
-    DosName = "licenses";
+    DosName = "readmes";
 End
 
 Directory gid_Brand_Dir_Help
@@ -209,11 +195,6 @@ Directory gid_Brand_Dir_Share_Config
     DosName = "config";
 End
 
-Directory gid_Brand_Dir_Share_Readme
-    ParentID = gid_Brand_Dir_Share;
-    DosName = "readme";
-End
-
 Directory gid_Brand_Dir_Share_Extension
     ParentID = gid_Brand_Dir_Share;
     DosName = "extension";
@@ -240,6 +221,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Af
     DosName = "dict-af";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Br
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-br";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Ca
     ParentID = gid_Brand_Dir_Share_Extensions;
     DosName = "dict-ca";
@@ -305,6 +291,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Hu
     DosName = "dict-hu";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Hr
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-hr";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_It
     ParentID = gid_Brand_Dir_Share_Extensions;
     DosName = "dict-it";
@@ -335,6 +326,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_No
     DosName = "dict-no";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Oc
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-oc";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Pl
     ParentID = gid_Brand_Dir_Share_Extensions;
     DosName = "dict-pl";
@@ -385,6 +381,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Th
     DosName = "dict-th";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Uk
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-uk";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Vi
     ParentID = gid_Brand_Dir_Share_Extensions;
     DosName = "dict-vi";
@@ -445,7 +446,7 @@ Unixlink gid_Brand_Unixlink_BasisLink
     // Styles = (LAYERLINK);
     Name = "basis-link";
     Dir = gid_Dir_Brand_Root;
-    Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}";
+    Target = "basis${OOOBASEVERSION}";
 End
 #endif
 
@@ -513,6 +514,17 @@ File gid_Brand_File_Bin_Soffice_Bin
     Name = "soffice.bin";
 End
 
+#if defined UNX && ! defined MACOSX
+
+File gid_File_Bin_QStart_Bin
+    BIN_FILE_BODY;
+    Dir = gid_Brand_Dir_Program;
+    Styles = (PACKED, PATCH);
+    Name = "oosplash.bin";
+End
+
+#endif
+
 // use this for high detail file open dialog >= 5.1 windows
 #ifdef WNT
 File gid_Brand_File_Bin_Soffice_Bin_Manifest
@@ -558,22 +570,6 @@ File gid_Brand_File_Bin_Unopkgexe
 End
 #endif
 
-#ifdef WNT
-File gid_Brand_File_Bin_Rebaseoo
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "rebaseoo.exe";
-End
-
-File gid_Brand_File_Bin_Rebasegui
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "rebasegui.exe";
-End
-#endif
-
 #if defined UNX && !defined MACOSX
 File gid_Brand_File_Script_Unopkg
     BIN_FILE_BODY;
@@ -600,18 +596,6 @@ File gid_Brand_File_Bin_Unopkg
     Name = "unopkg.bin";
 End
 
-#if defined WNT && \
-    (defined M1310 || \
-     ((defined M1400 || defined M1500) && \
-      !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA)))
-File gid_Brand_File_Bin_Msvcr71
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
-    Styles = (PACKED);
-End
-#endif
-
 // Due to Windows DLL search order, OOo executables might pick up a libxml2 DLL
 // from a Windows system directory instead of the one from the URE; to avoid
 // problems, as a HACK, for now a copy of the URE libxml2 DLL is placed next to
@@ -653,6 +637,13 @@ File gid_Brand_File_Images_Brand_Zip
     Styles = (PACKED);
 End
 
+File gid_Brand_File_Bmp_Shell
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Program_Shell;
+    Name = "shell.zip";
+    Styles = (ARCHIVE);
+End
+
 File gid_Brand_File_Txt_Package
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Share_Extensions;
@@ -738,16 +729,16 @@ File gid_Brand_File_Share_Xdg_Printeradmin
 End
 #endif
 
-//#if defined UNX && ! defined MACOSX
-//#ifdef ENABLE_GTK
-//File gid_Brand_File_Share_Xdg_QStart
-//    TXT_FILE_BODY;
-//    Dir = gid_Brand_Dir_Share_Xdg;
-//    Styles = (PACKED,SCPZIP_REPLACE);
-//    Name = "qstart.desktop";
-//End
-//#endif
-//#endif
+#if defined UNX && ! defined MACOSX
+#ifdef ENABLE_GTK
+File gid_Brand_File_Share_Xdg_QStart
+    TXT_FILE_BODY;
+    Dir = gid_Brand_Dir_Share_Xdg;
+    Styles = (PACKED,SCPZIP_REPLACE);
+    Name = "qstart.desktop";
+End
+#endif
+#endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Writer
@@ -786,23 +777,6 @@ File gid_Brand_File_Lib_Mingwm10
 End
 #endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcr80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcr80.dll";
-#else
-    Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
 #if defined(WNT) && defined( _gcc3 )
 
 #if defined(MINGW_GCCDLL)
@@ -829,57 +803,6 @@ End
 
 #endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcp80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcp80.dll";
-#else
-    Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Lib_Msvcm80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcm80.dll";
-#else
-    Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_Brand_File_Msvcm80crt_Manifest
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "Microsoft.VC80.CRT.manifest";
-#else
-    Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
 // Profiles
 
 Profile gid_Brand_Profile_Bootstrap_Ini
@@ -973,7 +896,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
   #elif defined MACOSX
     Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
   #else
-    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+    Value = "$SYSUSERCONFIG/%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
   #endif
 End
 
@@ -1039,19 +962,14 @@ ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So
     Value = "${NATIVEPROGRESS}";
 End
 
-#ifdef WNT
 ProfileItem gid_Brand_Profileitem_Soffice_Hideeula
     ProfileID = gid_Brand_Profile_Soffice_Ini;
     ModuleID = gid_Module_Root_Brand;
     Section = "Bootstrap";
     Order = 7;
     Key = "HideEula";
-    Value = "[HIDEEULA]";
-    Inifiletablekey = "HideEula";
-    Inifiletableaction = "1";
-    Styles = (INIFILETABLE);
+    Value = "1";
 End
-#endif
 
 #ifdef WNT
 ProfileItem gid_Brand_Profileitem_Soffice_Startlang
@@ -1195,6 +1113,24 @@ ProfileItem gid_Brand_Profileitem_Version_Useragent
     Value = "<PRODUCT> (${buildid}; ${_OS}; ${_ARCH}; BundledLanguages=${AllLanguages})";
 End
 
+ProfileItem gid_Brand_Profileitem_Version_Vendor
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 16;
+    Key = "Vendor";
+    Value = "<vendor>";
+End
+
+ProfileItem gid_Brand_Profileitem_Version_BuildVersion
+    ProfileID = gid_Brand_Profile_Version_Ini;
+    ModuleID = gid_Module_Root_Brand;
+    Section = "Version";
+    Order = 17;
+    Key = "BuildVersion";
+    Value = "<buildversion>";
+End
+
 ProfileItem gid_Brand_Profileitem_Version_Ooobaseversion
     ProfileID = gid_Brand_Profile_Version_Ini;
     ModuleID = gid_Module_Root_Brand;
@@ -1210,7 +1146,7 @@ ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
     Section = "Version";
     Order = 18;
     Key = "ExtensionUpdateURL";
-    Value = "http://updateexte.services.openoffice.org/ExtensionUpdateService/check.Update";
+    Value = "http://updateexte.libreoffice.org/ExtensionUpdateService/check.Update";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
@@ -1488,7 +1424,7 @@ End
 #endif
 
 //TODO: This actually belongs into a module of its own:
-#if !defined SYSTEM_PYTHON
+#if !defined DISABLE_PYUNO && !defined SYSTEM_PYTHON
 File gid_Brand_File_Bin_Python
     BIN_FILE_BODY;
     Name = EXENAME(pyuno/python);
@@ -1497,5 +1433,40 @@ File gid_Brand_File_Bin_Python
 End
 #endif
 
-BRAND_RES_FILE( gid_Brand_File_Res_About, about )
+File gid_License_Txt
+  TXT_FILE_BODY;
+#if defined MACOSX
+    Dir = gid_Brand_Dir_BasisLink;
+#else
+    Dir = gid_Dir_Brand_Root;
+#endif
+  #ifdef UNX
+    Name = "LICENSE";
+  #endif
+  #ifdef WNT
+    Name = "license.txt";
+  #endif
+    Styles = (PACKED);
+End
+
+File gid_License_Odt
+    BIN_FILE_BODY;
+#if defined MACOSX
+    Dir = gid_Brand_Dir_BasisLink;
+#else
+    Dir = gid_Dir_Brand_Root;
+#endif
+    Name = "LICENSE.odt";
+    Styles = (PACKED);
+End
 
+File gid_Credits_Odt
+    BIN_FILE_BODY;
+#if defined MACOSX
+    Dir = gid_Brand_Dir_BasisLink;
+#else
+    Dir = gid_Dir_Brand_Root;
+#endif
+    Name = "CREDITS.odt";
+    Styles = (PACKED);
+End
diff --git a/scp2/source/ooo/common_brand_readme.scp b/scp2/source/ooo/common_brand_readme.scp
index dea9145a000e..77aabc8232d3 100644
--- a/scp2/source/ooo/common_brand_readme.scp
+++ b/scp2/source/ooo/common_brand_readme.scp
@@ -29,81 +29,9 @@
 
 // Files
 
-File gid_Brand_File_Txt_License
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_ALL_LANG(Name, LICENSE);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, txt);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_Txt_License_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_License_License
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_License;
-  #ifdef UNX
-    README_ALL_LANG(Name, LICENSE);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, txt);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_License_License_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_License;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, license, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_Txt_Readme
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_ALL_LANG(Name, README);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, readme, txt);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_Brand_File_Txt_Readme_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Readme;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, README, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, readme, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
 File gid_Brand_File_Readme_Readme
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Readme;
+  TXT_FILE_BODY;
+  Dir = gid_Brand_Dir_Readme;
   #ifdef UNX
     README_ALL_LANG(Name, README);
   #endif
@@ -112,15 +40,3 @@ File gid_Brand_File_Readme_Readme
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
 End
-
-File gid_Brand_File_Readme_Readme_Html
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Readme;
-  #ifdef UNX
-    README_TXT_ALL_LANG(Name, README, html);
-  #endif
-  #ifdef WNT
-    README_TXT_ALL_LANG(Name, readme, html);
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 4b20c6de7cc1..0393302ce14b 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -75,7 +75,7 @@ Directory gid_Dir_Ooo_Openofficeorg
   #ifdef WNT
     HostName = "${BASISROOTNAME}";
   #else
-    HostName = "${UNIXBASISROOTNAME}";
+    HostName = ".";
   #endif
 End
 #endif
@@ -163,6 +163,11 @@ Directory gid_Dir_Shellnew
     DosName = "shellnew";
 End
 
+Directory gid_Dir_ShellnewToo
+    ParentID = gid_Dir_Program;
+    DosName = "2shellnew";
+End
+
 #endif
 
 Directory gid_Dir_User
@@ -995,6 +1000,11 @@ Directory gid_Dir_Template_Forms
     DIR_IDENT_ALL_LANG(forms);
 End
 
+Directory gid_Dir_Template_Labels
+    ParentID = gid_Dir_Template_Language;
+    DIR_IDENT_ALL_LANG(labels);
+End
+
 Directory gid_Dir_Template_Layout
     ParentID = gid_Dir_Template_Language;
     DIR_IDENT_ALL_LANG(layout);
@@ -1181,11 +1191,6 @@ Directory gid_Dir_Wordbook
     DosName = "wordbook";
 End
 
-Directory gid_Dir_Wordbook_Language
-    ParentID = gid_Dir_Wordbook;
-    DIR_ISOLANGUAGE_ALL_LANG_2;
-End
-
 Directory gid_Dir_Share_Plugin
     ParentID = gid_Dir_Share;
     DosName = "plugin";
@@ -1217,6 +1222,11 @@ End
 Directory gid_Dir_Help_Isolanguage
     ParentID = gid_Dir_Help;
     DIR_ISOLANGUAGE_ALL_LANG;
+#ifdef WITH_HELPPACK_INTEGRATION
+    Styles = (FORCEHELPPACK);
+#else
+    Styles = (HELPPACK);
+#endif
 End
 
 #ifdef UNX
@@ -1329,3 +1339,183 @@ Directory gid_Dir_Share_Icons
 End
 
 #endif
+
+/* *** Accessories Extras *** */
+
+/* ** Gallery ** */
+
+/* Draws */
+Directory gid_Dir_Gallery_Draws
+    ParentID = gid_Dir_Gallery;
+    DosName = "Draws";
+End
+
+/* Draws - People */
+Directory gid_Dir_Gallery_Draws_People
+    ParentID = gid_Dir_Gallery_Draws;
+    DosName = "People";
+End
+
+/* Photos */
+Directory gid_Dir_Gallery_Photos
+    ParentID = gid_Dir_Gallery;
+    DosName = "Photos";
+End
+
+/* Photos - Cities */
+Directory gid_Dir_Gallery_Photos_Cities
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Cities";
+End
+
+/* Photos - Buildings */
+Directory gid_Dir_Gallery_Photos_Buildings
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Buildings";
+End
+
+/* Photos - Plants */
+Directory gid_Dir_Gallery_Photos_Plants
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Plants";
+End
+
+/* Photos - Fauna */
+Directory gid_Dir_Gallery_Photos_Fauna
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Fauna";
+End
+
+/* Photos - Flowers */
+Directory gid_Dir_Gallery_Photos_Flowers
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Flowers";
+End
+
+/* Photos - Landscapes */
+Directory gid_Dir_Gallery_Photos_Landscapes
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Landscapes";
+End
+
+/* Photos - Statues */
+Directory gid_Dir_Gallery_Photos_Statues
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Statues";
+End
+
+/* Photos - Space */
+Directory gid_Dir_Gallery_Photos_Space
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Space";
+End
+
+/* Photos - Travel */
+Directory gid_Dir_Gallery_Photos_Travel
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Travel";
+End
+
+/* Photos - Objects */
+Directory gid_Dir_Gallery_Photos_Objects
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Objects";
+End
+
+/* Photos - Humans */
+Directory gid_Dir_Gallery_Photos_Humans
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Humans";
+End
+
+/* Photos - FoodsandDrinks */
+Directory gid_Dir_Gallery_Photos_FoodsandDrinks
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "FoodsandDrinks";
+End
+
+/* Photos - Celebration */
+Directory gid_Dir_Gallery_Photos_Celebration
+    ParentID = gid_Dir_Gallery_Photos;
+    DosName = "Celebration";
+End
+
+/* Samples - Documentations */
+Directory gid_Dir_Samples_Documentations
+    ParentID = gid_Dir_Samples_Language;
+    DosName = "Documentations";
+End
+
+/* Samples - Advertisement */
+Directory gid_Dir_Samples_Advertisement
+    ParentID = gid_Dir_Samples_Language;
+    DosName = "Advertisement";
+End
+
+/* Elements */
+Directory gid_Dir_Gallery_Elements
+    ParentID = gid_Dir_Gallery;
+    DosName = "Elements";
+End
+
+/* Elements - Bullets 2 */
+Directory gid_Dir_Gallery_Elements_Bullets2
+    ParentID = gid_Dir_Gallery_Elements;
+    DosName = "Bullets2";
+End
+
+ /* Templates - Common */
+Directory gid_Dir_Template_Common
+    ParentID = gid_Dir_Template;
+    DosName = "common";
+End
+
+Directory gid_Dir_Template_Common_Educate
+    ParentID = gid_Dir_Template_Common;
+    DosName = "educate";
+End
+
+Directory gid_Dir_Template_Common_Finance
+    ParentID = gid_Dir_Template_Common;
+    DosName = "finance";
+End
+
+Directory gid_Dir_Template_Common_Forms
+    ParentID = gid_Dir_Template_Common;
+    DosName = "forms";
+End
+
+Directory gid_Dir_Template_Common_Labels
+    ParentID = gid_Dir_Template_Common;
+    DosName = "labels";
+End
+
+Directory gid_Dir_Template_Common_Layout
+    ParentID = gid_Dir_Template_Common;
+    DosName = "layout";
+End
+
+Directory gid_Dir_Template_Common_Misc
+    ParentID = gid_Dir_Template_Common;
+    DosName = "misc";
+End
+
+Directory gid_Dir_Template_Common_Officorr
+    ParentID = gid_Dir_Template_Common;
+    DosName = "officorr";
+End
+
+Directory gid_Dir_Template_Common_Offimisc
+    ParentID = gid_Dir_Template_Common;
+    DosName = "offimisc";
+End
+
+Directory gid_Dir_Template_Common_Personal
+    ParentID = gid_Dir_Template_Common;
+    DosName = "personal";
+End
+
+Directory gid_Dir_Template_Common_Presnt
+    ParentID = gid_Dir_Template_Common;
+    DosName = "presnt";
+End
diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp
index ee4ad7522938..ab1138d70c44 100755..100644
--- a/scp2/source/ooo/directory_ooo_macosx.scp
+++ b/scp2/source/ooo/directory_ooo_macosx.scp
@@ -34,9 +34,7 @@ Directory gid_Dir_Bundle
     LangPackHostName = "%PRODUCTNAME Language Pack.app";
     PatchHostName = "%PRODUCTNAME Patch.app";
 End
-#endif
 
-#ifdef MACOSX
 Directory gid_Dir_Bundle_Contents
     ParentID = gid_Dir_Bundle;
     HostName = "Contents";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index ee8c46f2c33e..993161786c26 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -301,13 +301,6 @@ File gid_File_Extra_Palettes
     Patchfiles = ();
 End
 
-File gid_File_Extra_Palettes_Lang
-    Dir = gid_Dir_User_Config;
-    USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(palettes,zip);
-End
-
 File gid_File_Extra_Poll_Asp
     Dir = gid_Dir_Config_Webcast;
     PACKED_TXT_FILE_BODY;
@@ -350,13 +343,6 @@ File gid_File_Extra_Symbols
     Name = "symbols.zip";
 End
 
-File gid_File_Extra_Tpllayoutimpr_Lang
-    Dir = gid_Dir_Template_Layout;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(tpllayoutimpr,zip);
-End
-
 File gid_File_Extra_Tplpresntimpr_Lang
     Dir = gid_Dir_Template_Presnt;
     TXT_FILE_BODY;
@@ -364,6 +350,12 @@ File gid_File_Extra_Tplpresntimpr_Lang
     EXTRA_ALL_LANG(tplpresntimpr,zip);
 End
 
+File gid_File_Extra_Tpllayoutimpr
+    Dir = gid_Dir_Template_Common_Layout;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "tpllayoutimpr.zip";
+End
+
 File gid_File_Extra_Tplwizbitmap
     Dir = gid_Dir_Share_Template_Wizard_Bitmap;
     ARCHIVE_TXT_FILE_BODY;
@@ -383,12 +375,6 @@ File gid_File_Extra_Tplwizletter
     Name = "tplwizletter.zip";
 End
 
-File gid_File_Extra_Tplwizletter_Lang
-    Dir = gid_Dir_Template_Wizard_Letter;
-    ARCHIVE_TXT_FILE_BODY;
-    EXTRA_ALL_LANG(tplwizletter,zip);
-End
-
 File gid_File_Extra_Tplwizfax_Lang
     Dir = gid_Dir_Template_Wizard_Fax;
     TXT_FILE_BODY;
@@ -430,15 +416,8 @@ File gid_File_Extra_Webcast_Pl
 End
 
 File gid_File_Extra_Wordbook
-    Dir = gid_Dir_Wordbook_Language;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_IDENT_ALL_LANG(wordbook.zip);
-End
-
-File gid_File_Extra_Wordbook_Lang
-    Dir = gid_Dir_Wordbook_Language;
+    Dir = gid_Dir_Wordbook;
     TXT_FILE_BODY;
     Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_ALL_LANG(wordbook,zip);
+    Name = "wordbook.zip";
 End
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 10e2dca219fb..8b42a944f0d3 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -135,6 +135,18 @@ STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicItalic, GenBkBasI.ttf, Gentium Book
 STD_FONT_FILE( gid_File_Fnt_GentiumBookBasicBoldItalic, GenBkBasBI.ttf, Gentium Book Basic Bold Italic)
 #endif 
 
+// Linux Libertine G and Linux Biolinum G fonts
+
+#ifndef WITHOUT_FONTS
+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Regular, LinLibertineG_Re.ttf, Linux Libertine G Regular)
+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Bold, LinLibertineG_Bd.ttf, Linux Libertine G Bold)
+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_Italic, LinLibertineG_It.ttf, Linux Libertine G Italic)
+STD_FONT_FILE( gid_File_Fnt_LinuxLibertineG_BoldItalic, LinLibertineG_BI.ttf, Linux Libertine G Bold Italic)
+STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Regular, LinBiolinumG_Re.ttf, Linux Biolinum G Regular)
+STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Bold, LinBiolinumG_Bd.ttf, Linux Biolinum G Bold)
+STD_FONT_FILE( gid_File_Fnt_LinuxBiolinumG_Italic, LinBiolinumG_It.ttf, Linux Biolinum G Italic)
+#endif
+
 // fontconfig updates to allow proper use of local fonts
 
 #ifdef UNX
@@ -148,3 +160,30 @@ End
 #endif
 #endif
 
+#ifdef WNT
+#ifdef WITH_AGFA_MONOTYPE_FONTS
+STD_FONTWIN_FILE( gid_File_Fnt_albw, albw.ttf, AlbanyAMT)
+STD_FONTWIN_FILE( gid_File_Fnt_albwb, albwb.ttf, AlbanyAMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_albwbi, albwbi.ttf, AlbanyAMT Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_albwi, albwi.ttf, AlbanyAMT Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_andybol, andybol_.ttf, AndyMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_andyreg, andyreg_.ttf, AndyMT)
+STD_FONTWIN_FILE( gid_File_Fnt_ans, ans_____.ttf, Andale Sans)
+STD_FONTWIN_FILE( gid_File_Fnt_ansb, ansb____.ttf, Andale Sans Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_ansbi, ansbi___.ttf, Andale Sans Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_ansi, ansi____.ttf, Andale Sans Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_bl, bl______.ttf, BellMT)
+STD_FONTWIN_FILE( gid_File_Fnt_blb, blb_____.ttf, BellMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_blbi, blbi____.ttf, BellMT Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_bli, bli_____.ttf, BellMT Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_cumbwb, cumbwb__.ttf, CumberlandAMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_cumbwbi, cumbwbi_.ttf, CumberlandAMT Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_cumbwi, cumbwi__.ttf, CumberlandAMT Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_cumbwr, cumbwr__.ttf, CumberlandAMT)
+STD_FONTWIN_FILE( gid_File_Fnt_mtsorts, mtsorts_.ttf, Monotype Sorts)
+STD_FONTWIN_FILE( gid_File_Fnt_thowb, thowb___.ttf, ThorndaleAMT Bold)
+STD_FONTWIN_FILE( gid_File_Fnt_thowbi, thowbi__.ttf, ThorndaleAMT Bold Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_thowi, thowi___.ttf, ThorndaleAMT Italic)
+STD_FONTWIN_FILE( gid_File_Fnt_thowr, thowr___.ttf, ThorndaleAMT)
+#endif
+#endif
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 6c96df0d78ef..87891a257202 100755..100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -26,7 +26,7 @@
  ************************************************************************/
 #include "macros.inc"
 
-#ifdef WNT
+#if defined SOLAR_JAVA && defined WNT
 File gid_File_Lib_Accessbridge
     BIN_FILE_BODY;
     Styles = (PACKED);
@@ -34,9 +34,6 @@ File gid_File_Lib_Accessbridge
     Name = "java_uno_accessbridge.dll";
 End
 #endif
-#if ((defined(WNT)) || (defined(LINUX)) || ((defined(SOLARIS)) && (defined(SPARC)))|| defined(NETBSD) )
-STD_LIB_FILE( gid_File_Lib_Adabas, adabas)
-#endif
 
 #if defined(WNT)
 STD_LIB_FILE( gid_File_Lib_Ado, ado)
@@ -112,9 +109,7 @@ File gid_File_Lib_Cli_Oootypes_Assembly
     Version = "${CLI_OOOTYPES_NEW_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -130,9 +125,7 @@ File gid_File_Lib_Policy_Cli_Oootypes_Assembly
     Version = "${CLI_OOOTYPES_POLICY_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -208,25 +201,18 @@ End
 
 #endif
 
-//#ifdef UNX
-//#ifdef ENABLE_GTK
-//#ifdef ENABLE_SYSTRAY_GTK
-//File gid_File_Lib_Egg_Tray
-// TXT_FILE_BODY;
-// Styles = (PACKED);
-// Dir = SCP2_OOO_BIN_DIR;
-// Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX));
-//End
-//
-//File gid_File_Lib_QStart_Gtk
-//    Name = LIBNAME(qstart_gtk);
-//    TXT_FILE_BODY;
-//    Styles = (PACKED);
-//    Dir = SCP2_OOO_BIN_DIR;
-//End
-//#endif
-//#endif
-//#endif
+#ifdef UNX
+#ifdef ENABLE_GTK
+#ifdef ENABLE_SYSTRAY_GTK
+File gid_File_Lib_QStart_Gtk
+    Name = LIBNAME(qstart_gtk);
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+End
+#endif
+#endif
+#endif
 
 STD_LIB_FILE( gid_File_Lib_Dba, dba)
 
@@ -337,9 +323,9 @@ File gid_File_Lib_Vbaobj
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT4(libvbaobj,DLLPOSTFIX,.uno,UNXSUFFIX));
+    Name = STRING(CONCAT3(vbaobj,.uno,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(vbaobj,DLLPOSTFIX,.uno,.dll));
+    Name = STRING(CONCAT3(vbaobj,.uno,.dll));
   #endif
 End
 
@@ -537,9 +523,24 @@ File gid_File_Lib_Fps_Kde4
 End
 #endif
 #endif
+#ifdef ENABLE_KDE
+#ifndef MACOSX
+File gid_File_Lib_Fps_Kde
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Program;
+    Name = SPECIAL_COMPONENT_LIB_NAME(fps_kde.uno);
+End
+File gid_File_Bin_KdeFilePicker
+    BIN_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Brand_Dir_Program;
+    Name = "kdefilepicker";
+End
+#endif
+#endif
 #endif
 
-#ifdef MACOSX
 #ifdef QUARTZ
 File gid_File_Lib_Fps_Aqua
     TXT_FILE_BODY;
@@ -562,6 +563,9 @@ File gid_File_Lib_avmediaQuickTime
 	Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
+
+#ifdef WNT
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_ODMA, fps_odma.uno )
 #endif
 
 SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
@@ -589,6 +593,21 @@ File gid_File_Lib_Cairo
   #endif
 End
 
+File gid_File_Lib_Pixman
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Program;
+  #ifdef UNX
+    #ifdef MACOSX
+       Name = "libpixman-1.a";
+    #else
+       Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
+    #endif
+  #elif defined(WNT)
+    Name = "libpixman-1-0.dll";
+  #endif
+End
+
 #endif
 
 STD_LIB_FILE( gid_File_Lib_Frm , frm)
@@ -772,17 +791,6 @@ End
 
 #ifdef WNT
 
-File gid_File_Lib_relnotes
-    BIN_FILE_BODY;
-    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH);
-    Dir = SCP2_OOO_BIN_DIR;
-    Name = "relnotes.dll";
-End
-
-#endif
-
-#ifdef WNT
-
 File gid_File_Lib_Patchmsi
     TXT_FILE_BODY;
     Name = "patchmsi.dll";
@@ -882,10 +890,20 @@ End
 
 STD_LIB_FILE(gid_File_Lib_Wpft,wpft)
 
+STD_LIB_FILE(gid_File_Lib_Msworks,msworks)
+
 STD_LIB_FILE(gid_File_Lib_T602Filter,t602filter)
 
+STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft)
+
 STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter)
 
+STD_LIB_FILE(gid_File_Lib_Resource,resourcemodel)
+
+STD_LIB_FILE(gid_File_Lib_Doctok,doctok)
+
+STD_LIB_FILE(gid_File_Lib_ooxml,ooxml)
+
 #ifdef WNT
 #if defined(_gcc3)
 
@@ -899,57 +917,6 @@ End
 #endif
 #endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcr80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcr80.dll";
-#else
-    Name = "msvcr80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcp80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcp80.dll";
-#else
-    Name = "msvcp80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcm80
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "msvcm80.dll";
-#else
-    Name = "msvcm80d.dll";
-#endif
-End
-#endif
-#endif
-#endif
-
 #if defined(WNT) && defined( _gcc3 )
 
 #if defined(MINGW_GCCDLL)
@@ -976,23 +943,6 @@ End
 
 #endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Msvcm80crt_Manifest
-    BIN_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Program;
-#ifndef _STLP_DEBUG
-    Name = "Microsoft.VC80.CRT.manifest";
-#else
-    Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
-End
-#endif
-#endif
-#endif
-
 STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
 STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
 
@@ -1090,6 +1040,14 @@ File gid_File_Lib_Vclplug_Gtk
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
+#ifdef ENABLE_GTK3
+File gid_File_Lib_Vclplug_Gtk3
+    Name = LIBNAME(vclplug_gtk3);
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+End
+#endif
 #ifdef ENABLE_KDE
 #ifndef MACOSX
 File gid_File_Lib_Vclplug_Kde
@@ -1311,6 +1269,10 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Spl, spl)
 
+#if defined UNX && !defined MACOSX
+STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx)
+#endif
+
 SPECIAL_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
 
 STD_LIB_FILE( gid_File_Lib_Sts , sts)
@@ -1420,6 +1382,10 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpext, ucpext.uno)
 
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
 
+#ifdef WNT
+SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
+#endif
+
 File gid_File_Lib_Lnth
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -1447,17 +1413,6 @@ File gid_File_Lib_Vcl
     Dir = SCP2_OOO_BIN_DIR;
 End
 
-File gid_File_Lib_Vos
-    TXT_FILE_BODY;
-  #ifdef UNX
-    Name = STRING(CONCAT3(libvos3,COMID,UNXSUFFIX));
-  #else
-    Name = STRING(CONCAT3(vos3,COMID,.dll));
-  #endif
-    Dir = SCP2_OOO_BIN_DIR;
-    Styles = (PACKED);
-End
-
 STD_LIB_FILE( gid_File_Lib_Xcr, xcr)
 STD_LIB_FILE( gid_File_Lib_Xmx , xmx)
 STD_LIB_FILE( gid_File_Lib_Xof , xof)
@@ -1508,10 +1463,10 @@ STD_LIB_FILE( gid_File_Lib_Unoxml, unoxml )
 // AVMedia
 STD_LIB_FILE( gid_File_Lib_AVMedia, avmedia )
 
-#if defined UNX 
-#if defined ENABLE_GSTREAMER
-SPECIAL_LIB_FILE( gid_File_Lib_AVMediaGst, avmediagst )
-#endif
+#ifdef GSTREAMER
+SPECIAL_LIB_FILE_PATCH( gid_File_Lib_AVMediaGStreamer, avmediagst )
+#else
+#if defined UNX
 #ifdef SOLAR_JAVA
 STD_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
 #endif
@@ -1520,6 +1475,7 @@ STD_JAR_FILE( gid_File_Jar_AVmedia, avmedia )
 SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWin, avmediawin )
 #endif
 #endif
+#endif
 
 #ifndef WITHOUT_MOZILLA
 File gid_File_Lib_XSec_Framework
@@ -1593,6 +1549,17 @@ File gid_File_Lib_Migrationoo2
   #endif
 End
 
+File gid_File_Lib_Migrationoo3
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+    Name = STRING(CONCAT2(migrationoo3.uno,UNXSUFFIX));
+  #else
+    Name = "migrationoo3.uno.dll";
+  #endif
+End
+
 #ifndef SYSTEM_LIBTEXTCAT
 File gid_File_Lib_Libtextcat
     TXT_FILE_BODY;
@@ -1660,8 +1627,7 @@ End
 
 STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore)
 
-#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \
-    !(defined M1400 && defined PROF_EDITION && !defined _STLP_DEBUG)
+#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA
         // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and
         // gid_Brand_File_Lib_Msvcr80
 File gid_File_Moz_Msvcp80
@@ -1676,6 +1642,12 @@ File gid_File_Moz_Msvcr80
     Name = SCP2_URE_DL_NORMAL("msvcr80");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
 End
+File gid_File_Moz_Msvc80crt_Manifest
+    BIN_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Dir_Program;
+    Name = "Microsoft.VC80.CRT.manifest";
+End
 #endif
 
 #ifndef SYSTEM_REDLAND
@@ -1764,7 +1736,7 @@ File gid_File_Lib_Glib
     #ifdef MACOSX
     Name = "libglib-2.0.0.dylib";
     #elif defined WNT
-    Name = "libglib-2.0-0.dll";
+    Name = "gliblo.dll";
     #endif
 End
 File gid_File_Lib_Gthread
@@ -1774,7 +1746,7 @@ File gid_File_Lib_Gthread
     #ifdef MACOSX
     Name = "libgthread-2.0.0.dylib";
     #elif defined WNT
-    Name = "libgthread-2.0-0.dll";
+    Name = "gthreadlo.dll";
     #endif
 End
 File gid_File_Lib_Gobject
@@ -1784,7 +1756,7 @@ File gid_File_Lib_Gobject
     #ifdef MACOSX
     Name = "libgobject-2.0.0.dylib";
     #elif defined WNT
-    Name = "libgobject-2.0-0.dll";
+    Name = "gobjectlo.dll";
     #endif
 End
 File gid_File_Lib_Gio
@@ -1794,7 +1766,7 @@ File gid_File_Lib_Gio
     #ifdef MACOSX
     Name = "libgio-2.0.0.dylib";
     #elif defined WNT
-    Name = "libgio-2.0-0.dll";
+    Name = "giolo.dll";
     #endif
 End
 File gid_File_Lib_Gmodule
@@ -1804,11 +1776,13 @@ File gid_File_Lib_Gmodule
     #ifdef MACOSX
     Name = "libgmodule-2.0.0.dylib";
     #elif defined WNT
-    Name = "libgmodule-2.0-0.dll";
+    Name = "gmodulelo.dll";
     #endif
 End
 #endif
 
+#if ENABLE_LIBRSVG
+
 #if ! defined SYSTEM_GDKPIXBUF
 File gid_File_Lib_Gdkpixbuf
     TXT_FILE_BODY;
@@ -1843,7 +1817,7 @@ File gid_File_Lib_Libpango
     #ifdef MACOSX
     Name = "libpango-1.0.0.dylib";
     #elif defined WNT
-    Name = "libpango-1.0-0.dll";
+    Name = "pangolo.dll";
     #endif
 End
 File gid_File_Lib_Libpangocairo
@@ -1853,7 +1827,7 @@ File gid_File_Lib_Libpangocairo
     #ifdef MACOSX
     Name = "libpangocairo-1.0.0.dylib";
     #elif defined WNT
-    Name = "libpangocairo-1.0-0.dll";
+    Name = "pangocairolo.dll";
     #endif
 End
 #if defined WNT
@@ -1861,7 +1835,7 @@ File gid_File_Lib_Libpangowin32
     TXT_FILE_BODY;
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
-    Name = "libpangowin32-1.0-0.dll";
+    Name = "pangowin32lo.dll";
 End
 #endif
 #endif
@@ -1890,3 +1864,17 @@ File gid_File_Lib_Librsvg
 End
 #endif
 
+#endif
+
+#ifdef WNT
+File gid_File_Lib_sellangmsi
+    TXT_FILE_BODY;
+    Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
+    Dir = gid_Dir_Program;
+    Name = "sellangmsi.dll";
+End
+#endif
+
+#ifdef ENABLE_LOMENUBAR
+SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Lomenubar, lomenubar.uno )
+#endif
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 1cc97d8bef12..28891ed60f1d 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -108,17 +108,6 @@ File gid_File_Basic_Tutorials
     Name = "basicsrvtutorials.zip";
 End
 
-#ifdef UNX
-
-File gid_File_Bin_Pagein
-    BIN_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Styles = (PACKED);
-    Name = "pagein";
-End
-
-#endif
-
 #ifndef WITHOUT_MOZILLA
 
 #if !defined(UNX) || defined(ENABLE_GTK)
@@ -314,10 +303,10 @@ File gid_File_Dtd_Toolbar
     Name = "toolbar.dtd";
 End
 
-STD_FILTER_FILE( gid_File_Filter_Eme, eme)
-
 STD_FILTER_FILE( gid_File_Filter_Sdfilt, sdfilt)
 
+STD_FILTER_FILE( gid_File_Filter_Eme, eme)
+
 STD_FILTER_FILE( gid_File_Filter_Icg, icg)
 
 STD_FILTER_FILE( gid_File_Filter_Egi, egi)
@@ -364,7 +353,7 @@ STD_RES_FILE( gid_File_Res_Eps, eps )
 
 File gid_File_Help_Common_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(shared);
     Patchfiles = ();
 End
@@ -377,14 +366,14 @@ End
 
 File gid_File_Help_Sbasic_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(sbasic);
     Patchfiles = ();
 End
 
 File gid_File_Help_Schart_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(schart);
 End
 
@@ -417,10 +406,6 @@ STD_JAR_FILE( gid_File_Jar_Lucenehelpwrapper, LuceneHelpWrapper )
 #endif
 
 #ifdef SOLAR_JAVA
-STD_JAR_FILE( gid_File_Jar_Js, js )
-#endif
-
-#ifdef SOLAR_JAVA
 
 #ifndef MACOSX
 
@@ -465,9 +450,7 @@ End
 
 #ifdef SOLAR_JAVA
 STD_JAR_FILE( gid_File_Jar_Scriptframework, ScriptFramework )
-STD_JAR_FILE( gid_File_Jar_Scriptproviderforbeanshell, ScriptProviderForBeanShell )
 STD_JAR_FILE( gid_File_Jar_Scriptproviderforjava, ScriptProviderForJava )
-STD_JAR_FILE( gid_File_Jar_Scriptproviderforjavascript, ScriptProviderForJavaScript )
 #endif
 
 #ifdef SOLAR_JAVA
@@ -1010,7 +993,6 @@ File gid_File_Lm_Zulu
 End
 #endif
 
-
 // mod files
 
 File gid_File_Mod_Chart
@@ -1191,21 +1173,29 @@ File gid_File_Share_Registry_Ctl_Xcd
     TXT_FILE_BODY;
     Styles = (PACKED,MAKE_LANG_SPECIFIC);
     Dir = gid_Dir_Share_Registry;
-    Name (th) = "ctl.xcd";
-    Name (hi-IN) = "ctl.xcd";
-    Name (pa-IN) = "ctl.xcd";
-    Name (ta-IN) = "ctl.xcd";
-    Name (gu-IN) = "ctl.xcd";
     Name (ar) = "ctl.xcd";
-    Name (he) = "ctl.xcd";
-    Name (lo) = "ctl.xcd";
     Name (dz) = "ctl.xcd";
-    Name (km) = "ctl.xcd";
-    Name (gu-IN) = "ctl.xcd";
-    Name (or) = "ctl.xcd";
-    Name (ne) = "ctl.xcd";
     Name (fa) = "ctl.xcd";
+    Name (gu) = "ctl.xcd";
+    Name (he) = "ctl.xcd";
+    Name (hi) = "ctl.xcd";
+    Name (km) = "ctl.xcd";
+    Name (lo) = "ctl.xcd";
     Name (my) = "ctl.xcd";
+    Name (ne) = "ctl.xcd";
+    Name (or) = "ctl.xcd";
+    Name (pa-IN) = "ctl.xcd";
+    Name (ta) = "ctl.xcd";
+    Name (th) = "ctl.xcd";
+End
+
+File gid_File_Share_Registry_Ctlseqcheck_Xcd
+    TXT_FILE_BODY;
+    Styles = (PACKED,MAKE_LANG_SPECIFIC);
+    Dir = gid_Dir_Share_Registry;
+    Name (km) = "ctlseqcheck.xcd";
+    Name (lo) = "ctlseqcheck.xcd";
+    Name (th) = "ctlseqcheck.xcd";
 End
 
 File gid_File_Scripts_Beanshell
@@ -1241,27 +1231,59 @@ End
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods)
 
+File gid_File_Shellnew2_Ods_Soffice
+    TXT_FILE_BODY;
+    Styles = (PACKED,WORKSTATION, OVERWRITE);
+    Dir = PREDEFINED_OSWINSHELLNEWDIR;
+    NetDir = gid_Dir_ShellnewToo;
+    Name = "soffice.ods";
+End
+
 #endif
 
 #ifdef WNT
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Odg_Soffice, soffice.odg)
 
+File gid_File_Shellnew2_Odg_Soffice
+    TXT_FILE_BODY;
+    Styles = (PACKED,WORKSTATION, OVERWRITE);
+    Dir = PREDEFINED_OSWINSHELLNEWDIR;
+    NetDir = gid_Dir_ShellnewToo;
+    Name = "soffice.odg";
+End
+
 #endif
 
 #ifdef WNT
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Odp_Soffice, soffice.odp)
 
+File gid_File_Shellnew2_Odp_Soffice
+    TXT_FILE_BODY;
+    Styles = (PACKED,WORKSTATION, OVERWRITE);
+    Dir = PREDEFINED_OSWINSHELLNEWDIR;
+    NetDir = gid_Dir_ShellnewToo;
+    Name = "soffice.odp";
+End
+
 #endif
 
 #ifdef WNT
 
 STD_SHELLNEW_FILE(gid_File_Shellnew_Odt_Soffice, soffice.odt)
 
+File gid_File_Shellnew2_Odt_Soffice
+    TXT_FILE_BODY;
+    Styles = (PACKED,WORKSTATION, OVERWRITE);
+    Dir = PREDEFINED_OSWINSHELLNEWDIR;
+    NetDir = gid_Dir_ShellnewToo;
+    Name = "soffice.odt";
+End
+
 #endif
 
-#ifdef UNX
+#if defined UNX && ! defined MACOSX
 
 File gid_File_Txt_Pagein_Calc
     TXT_FILE_BODY;
@@ -1270,10 +1292,6 @@ File gid_File_Txt_Pagein_Calc
     Name = "pagein-calc";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Common
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1281,10 +1299,6 @@ File gid_File_Txt_Pagein_Common
     Name = "pagein-common";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Draw
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1292,10 +1306,6 @@ File gid_File_Txt_Pagein_Draw
     Name = "pagein-draw";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Impress
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1303,10 +1313,6 @@ File gid_File_Txt_Pagein_Impress
     Name = "pagein-impress";
 End
 
-#endif
-
-#ifdef UNX
-
 File gid_File_Txt_Pagein_Writer
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
@@ -1740,21 +1746,6 @@ File gid_File_Config_Javasettingsunopkginstall
   #endif
 End
 
-#if defined( BUILD_SPECIAL )
-#if !defined( MACOSX )
-File gid_File_Stclient_Wrapper
-    Dir = gid_Dir_Program;
-    BIN_FILE_BODY;
-#if defined ( WNT )
-    Name = "stclient_wrapper.exe";
-#else
-    Name = "stclient_wrapper";
-#endif
-    Styles = ();
-End
-#endif
-#endif
-
 #ifdef ENABLE_SVCTAGS
 File gid_File_Jar_Productregistration
     TXT_FILE_BODY;
@@ -1764,54 +1755,50 @@ File gid_File_Jar_Productregistration
 End
 #endif
 
+#ifdef THEME_DEFAULT
 File gid_File_Images_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images.zip";
     Styles = (PACKED);
 End
+#endif
 
+#ifdef THEME_CRYSTAL
 File gid_File_ImagesCrystal_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images_crystal.zip";
     Styles = (PACKED);
 End
+#endif
 
+#ifdef THEME_OXYGEN
 File gid_File_ImagesOxygen_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images_oxygen.zip";
     Styles = (PACKED);
 End
+#endif
 
+#ifdef THEME_HICONTRAST
 File gid_File_ImagesHicontrast_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images_hicontrast.zip";
     Styles = (PACKED);
 End
+#endif
 
-File gid_File_ImagesIndustrial_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
-    Name = "images_industrial.zip";
-    Styles = (PACKED);
-End
-
+#ifdef THEME_TANGO
 File gid_File_ImagesTango_Zip
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Config;
     Name = "images_tango.zip";
     Styles = (PACKED);
 End
-
-File gid_File_ImagesClassic8_Zip
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Config;
-    Name = "images_classic.zip";
-    Styles = (PACKED);
-End
+#endif
 
 File gid_File_Share_Registry_Lingucomponent_Xcd
     TXT_FILE_BODY;
@@ -1832,6 +1819,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Br
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Br;
+	Name = "dict-br.oxt";
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ca
     Dir = gid_Brand_Dir_Share_Extensions_Dict_Ca;
     Name = "dict-ca.oxt";
@@ -1949,6 +1945,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Hr
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Hr;
+	Name = "dict-hr.oxt";
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_It
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_It;
 	Name = "dict-it.oxt";
@@ -2003,6 +2008,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Oc
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Oc;
+	Name = "dict-oc.oxt";
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Pl
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pl;
 	Name = "dict-pl.oxt";
@@ -2093,6 +2107,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Uk
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Uk;
+	Name = "dict-uk.oxt";
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Vi
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Vi;
 	Name = "dict-vi.oxt";
diff --git a/scp2/source/ooo/folderitem_ooo.ulf b/scp2/source/ooo/folderitem_ooo.ulf
index 93d938531abe..2c4696dacc43 100644
--- a/scp2/source/ooo/folderitem_ooo.ulf
+++ b/scp2/source/ooo/folderitem_ooo.ulf
@@ -32,4 +32,4 @@ en-US = "From Template"
 en-US = "Open Document"
 
 [STR_FI_TOOLTIP_SOFFICE]
-en-US = "The office productivity suite compatible to the open and standardized ODF document format. Supported by Oracle."
+en-US = "LibreOffice, the office productivity suite provided by The Document Foundation. See http://www.documentfoundation.org"
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 7a7507c9fcad..f27828489d64 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -49,6 +49,9 @@ SCPDEFS+=-DBUILD_SPECIAL
 SCPDEFS+=-DBUILD_X64
 .ENDIF
 
+.IF "$(ENABLE_OPENGL)"=="TRUE"
+SCPDEFS+=-DENABLE_OPENGL
+.ENDIF
 .IF "$(PROF_EDITION)"!=""
 SCPDEFS+=-DPROF_EDITION
 .ENDIF
@@ -63,15 +66,10 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES)
 SCPDEFS+=-DGTK_TWO_FOUR
 .ENDIF
 .ENDIF
-.ENDIF			# "$(GUI)"=="UNX"
-
-.IF "$(ENABLE_SYSTRAY_GTK)" != ""
-SCPDEFS+=-DENABLE_SYSTRAY_GTK
-.ENDIF
-
-.IF "$(ENABLE_GSTREAMER)" != ""
-SCPDEFS+=-DENABLE_GSTREAMER
+.IF "$(ENABLE_GTK3)" != ""
+SCPDEFS+=-DENABLE_GTK3
 .ENDIF
+.ENDIF			# "$(GUI)"=="UNX"
 
 .IF "$(ENABLE_KDE)" != ""
 SCPDEFS+=-DENABLE_KDE
@@ -120,10 +118,6 @@ SCPDEFS+=-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR)
 SCPDEFS+=-DSYSTEM_DB
 .ENDIF
 
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
 .IF "$(WITH_MOZILLA)" == "NO"
 SCPDEFS+=-DWITHOUT_MOZILLA
 .ENDIF
@@ -223,9 +217,13 @@ SCPDEFS+=-DOPENSSL
 SCPDEFS+=-DDISABLE_ATL
 .ENDIF
 
+.IF "$(DISABLE_PYTHON)" == "TRUE"
+SCPDEFS+=-DDISABLE_PYUNO
+.ELSE
 .IF "$(SYSTEM_PYTHON)" == "YES"
 SCPDEFS+=-DSYSTEM_PYTHON
 .ENDIF
+.ENDIF
 
 .IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBTEXTCAT
@@ -271,6 +269,10 @@ SCPDEFS+=-DSYSTEM_LIBCROCO
 SCPDEFS+=-DSYSTEM_LIBJPEG
 .ENDIF
 
+.IF "$(ENABLE_LIBRSVG)" == "INTERNAL"
+SCPDEFS+=-DENABLE_LIBRSVG
+.ENDIF
+
 .IF "$(SYSTEM_LIBRSVG)" == "YES"
 SCPDEFS+=-DSYSTEM_LIBRSVG
 .ENDIF
@@ -283,6 +285,9 @@ SCPDEFS+=-DSYSTEM_PANGO
 SCPDEFS+=-DSYSTEM_LIBGSF
 .ENDIF
 
+.IF "$(ENABLE_LOMENUBAR)" == "TRUE"
+SCPDEFS+=-DENABLE_LOMENUBAR
+.ENDIF
 
 SCP_PRODUCT_TYPE=osl
 
@@ -298,7 +303,6 @@ PARFILES=                          \
         scpaction_ooo.par          \
         directory_ooo.par          \
         directory_ooo_macosx.par   \
-        datacarrier_ooo.par        \
         file_ooo.par               \
         file_extra_ooo.par         \
         file_font_ooo.par          \
@@ -310,6 +314,8 @@ PARFILES=                          \
         module_hidden_ooo.par      \
         module_langpack.par        \
         module_lang_template.par   \
+        module_helppack.par        \
+        module_help_template.par   \
         module_java.par            \
         module_systemint.par       \
         module_improvement.par     \
@@ -337,6 +343,7 @@ ULFFILES=                          \
         folderitem_ooo.ulf         \
         module_ooo.ulf             \
         module_langpack.ulf        \
+        module_helppack.ulf        \
         module_java.ulf            \
         registryitem_ooo.ulf       \
         module_systemint.ulf
diff --git a/scp2/source/ooo/module_help_template.scp b/scp2/source/ooo/module_help_template.scp
new file mode 100644
index 000000000000..4022d59231ac
--- /dev/null
+++ b/scp2/source/ooo/module_help_template.scp
@@ -0,0 +1,46 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+Module gid_Module_Helppack_Help_Template
+    ParentID = gid_Module_Helppack_Helproot;
+    Name = "gid_Module_Helppack_Help_Template";
+    Description = "gid_Module_Helppack_Help_Template";
+    Styles = (TEMPLATEMODULE);
+    Files = (gid_File_Help_Common_Zip,
+             gid_File_Help_Sbasic_Zip,
+             gid_File_Help_Scalc_Zip,
+             gid_File_Help_Schart_Zip,
+             gid_File_Help_Sdatabase_Zip,
+             gid_File_Help_Sdraw_Zip,
+             gid_File_Help_Simpress_Zip,
+             gid_File_Help_Smath_Zip,
+             gid_File_Help_Swriter_Zip);
+    Dirs = (gid_Brand_Dir_Help,
+            gid_Brand_Dir_Help_Isolanguage);
+End
+
+#include "allhelpmodules_root.inc"
diff --git a/scp2/source/ooo/datacarrier_ooo.scp b/scp2/source/ooo/module_helppack.scp
index 89bfef1e5626..3614cb987350 100644
--- a/scp2/source/ooo/datacarrier_ooo.scp
+++ b/scp2/source/ooo/module_helppack.scp
@@ -27,8 +27,16 @@
 
 #include "macros.inc"
 
-DataCarrier gid_Datacarrier
-    Name = "%PRODUCTNAME %PRODUCTVERSION";
-    DiskNo = 1;
+Module gid_Module_Helppack_Helproot
+    ParentID = gid_Module_Root;
+    XPDParentID = "root";
+    Sortkey = "300";
+    MOD_NAME_DESC(MODULE_ROOT_HELPPACK);
+#ifdef WITH_HELPPACK_INTEGRATION
+    Styles = (SHOW_MULTILINGUAL_ONLY);
+#else
+    Styles = (HIDDEN_ROOT);
+#endif
 End
 
+#include "allhelpmodules.inc"
diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf
new file mode 100644
index 000000000000..b9bb3616fabd
--- /dev/null
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -0,0 +1,848 @@
+/*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+ 
+[STR_NAME_MODULE_ROOT_HELPPACK]
+en-US = "Additional help packs"
+
+[STR_DESC_MODULE_ROOT_HELPPACK]
+en-US = "Additional help packs"
+
+[STR_NAME_MODULE_HELPPACK_EN_US]
+en-US = "English"
+
+[STR_DESC_MODULE_HELPPACK_EN_US]
+en-US = "Installs English help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DE]
+en-US = "German"
+
+[STR_DESC_MODULE_HELPPACK_DE]
+en-US = "Installs German help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_FR]
+en-US = "French"
+
+[STR_DESC_MODULE_HELPPACK_FR]
+en-US = "Installs French help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_IT]
+en-US = "Italian"
+
+[STR_DESC_MODULE_HELPPACK_IT]
+en-US = "Installs Italian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ES]
+en-US = "Spanish"
+
+[STR_DESC_MODULE_HELPPACK_ES]
+en-US = "Installs Spanish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SV]
+en-US = "Swedish"
+
+[STR_DESC_MODULE_HELPPACK_SV]
+en-US = "Installs Swedish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_HELPPACK_PT]
+en-US = "Installs Portuguese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PT_BR]
+en-US = "Portuguese (Brazil)"
+
+[STR_DESC_MODULE_HELPPACK_PT_BR]
+en-US = "Installs Portuguese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_JA]
+en-US = "Japanese"
+
+[STR_DESC_MODULE_HELPPACK_JA]
+en-US = "Installs Japanese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KO]
+en-US = "Korean"
+
+[STR_DESC_MODULE_HELPPACK_KO]
+en-US = "Installs Korean help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ZH_CN]
+en-US = "Chinese (simplified)"
+
+[STR_DESC_MODULE_HELPPACK_ZH_CN]
+en-US = "Installs Chinese (simplified) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ZH_TW]
+en-US = "Chinese (traditional)"
+
+[STR_DESC_MODULE_HELPPACK_ZH_TW]
+en-US = "Installs Chinese (traditional) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NL]
+en-US = "Dutch"
+
+[STR_DESC_MODULE_HELPPACK_NL]
+en-US = "Installs Dutch help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HU]
+en-US = "Hungarian"
+
+[STR_DESC_MODULE_HELPPACK_HU]
+en-US = "Installs Hungarian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PL]
+en-US = "Polish"
+
+[STR_DESC_MODULE_HELPPACK_PL]
+en-US = "Installs Polish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_RU]
+en-US = "Russian"
+
+[STR_DESC_MODULE_HELPPACK_RU]
+en-US = "Installs Russian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TR]
+en-US = "Turkish"
+
+[STR_DESC_MODULE_HELPPACK_TR]
+en-US = "Installs Turkish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EL]
+en-US = "Greek"
+
+[STR_DESC_MODULE_HELPPACK_EL]
+en-US = "Installs Greek help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TH]
+en-US = "Thai"
+
+[STR_DESC_MODULE_HELPPACK_TH]
+en-US = "Installs Thai help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CS]
+en-US = "Czech"
+
+[STR_DESC_MODULE_HELPPACK_CS]
+en-US = "Installs Czech help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SK]
+en-US = "Slovak"
+
+[STR_DESC_MODULE_HELPPACK_SK]
+en-US = "Installs Slovak help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_HELPPACK_HR]
+en-US = "Installs Croatian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ET]
+en-US = "Estonian"
+
+[STR_DESC_MODULE_HELPPACK_ET]
+en-US = "Installs Estonian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_VI]
+en-US = "Vietnamese"
+
+[STR_DESC_MODULE_HELPPACK_VI]
+en-US = "Installs Vietnamese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BG]
+en-US = "Bulgarian"
+
+[STR_DESC_MODULE_HELPPACK_BG]
+en-US = "Installs Bulgarian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KM]
+en-US = "Khmer"
+
+[STR_DESC_MODULE_HELPPACK_KM]
+en-US = "Installs Khmer help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PA_IN]
+en-US = "Punjabi"
+
+[STR_DESC_MODULE_HELPPACK_PA_IN]
+en-US = "Installs Punjabi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GU_IN]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_HELPPACK_GU_IN]
+en-US = "Installs Gujarati help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TA]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_HELPPACK_TA]
+en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TA_IN]
+en-US = "Tamil"
+
+[STR_DESC_MODULE_HELPPACK_TA_IN]
+en-US = "Installs Tamil help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HI]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_HELPPACK_HI]
+en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HI_IN]
+en-US = "Hindi"
+
+[STR_DESC_MODULE_HELPPACK_HI_IN]
+en-US = "Installs Hindi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ST]
+en-US = "Southern Sotho (Sutu)"
+
+[STR_DESC_MODULE_HELPPACK_ST]
+en-US = "Installs Southern Sotho (Sutu) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TN]
+en-US = "Tswana"
+
+[STR_DESC_MODULE_HELPPACK_TN]
+en-US = "Installs Tswana help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_XH]
+en-US = "Xhosa"
+
+[STR_DESC_MODULE_HELPPACK_XH]
+en-US = "Installs Xhosa help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ZU]
+en-US = "Zulu"
+
+[STR_DESC_MODULE_HELPPACK_ZU]
+en-US = "Installs Zulu help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AF]
+en-US = "Afrikaans"
+
+[STR_DESC_MODULE_HELPPACK_AF]
+en-US = "Installs Afrikaans help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SW]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_HELPPACK_SW]
+en-US = "Installs Swahili help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SW_TZ]
+en-US = "Swahili"
+
+[STR_DESC_MODULE_HELPPACK_SW_TZ]
+en-US = "Installs Swahili help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_LO]
+en-US = "Lao"
+
+[STR_DESC_MODULE_HELPPACK_LO]
+en-US = "Installs Lao help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NSO]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_HELPPACK_NSO]
+en-US = "Installs Northern Sotho help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BN]
+en-US = "Bengali"
+
+[STR_DESC_MODULE_HELPPACK_BN]
+en-US = "Installs Bengali help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BN_BD]
+en-US = "Bengali (Bangladesh)"
+
+[STR_DESC_MODULE_HELPPACK_BN_BD]
+en-US = "Installs Bengali (Bangladesh) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BN_IN]
+en-US = "Bengali (India)"
+
+[STR_DESC_MODULE_HELPPACK_BN_IN]
+en-US = "Installs Bengali (India) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_OR]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_HELPPACK_OR]
+en-US = "Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_OR_IN]
+en-US = "Oriya"
+
+[STR_DESC_MODULE_HELPPACK_OR_IN]
+en-US = "Installs Oriya help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MR]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_HELPPACK_MR]
+en-US = "Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MR_IN]
+en-US = "Marathi"
+
+[STR_DESC_MODULE_HELPPACK_MR_IN]
+en-US = "Installs Marathi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NE]
+en-US = "Nepali"
+
+[STR_DESC_MODULE_HELPPACK_NE]
+en-US = "Installs Nepali help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_HELPPACK_AR]
+en-US = "Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AR_SA]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_HELPPACK_AR_SA]
+en-US = "Installs Arabic help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CA]
+en-US = "Catalan"
+
+[STR_DESC_MODULE_HELPPACK_CA]
+en-US = "Installs Catalan help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CA_XV]
+en-US = "Catalan (Valencian)"
+
+[STR_DESC_MODULE_HELPPACK_CA_XV]
+en-US = "Installs Catalan (Valencian) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DA]
+en-US = "Danish"
+
+[STR_DESC_MODULE_HELPPACK_DA]
+en-US = "Installs Danish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_FI]
+en-US = "Finnish"
+
+[STR_DESC_MODULE_HELPPACK_FI]
+en-US = "Installs Finnish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HE]
+en-US = "Hebrew"
+
+[STR_DESC_MODULE_HELPPACK_HE]
+en-US = "Installs Hebrew help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_IS]
+en-US = "Icelandic"
+
+[STR_DESC_MODULE_HELPPACK_IS]
+en-US = "Installs Icelandic help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NB]
+en-US = "Norwegian (Bokmål)"
+
+[STR_DESC_MODULE_HELPPACK_NB]
+en-US = "Installs Norwegian (Bokmål) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NN]
+en-US = "Norwegian (Nynorsk)"
+
+[STR_DESC_MODULE_HELPPACK_NN]
+en-US = "Installs Norwegian (Nynorsk) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_RM]
+en-US = "Rhaeto-Romance"
+
+[STR_DESC_MODULE_HELPPACK_RM]
+en-US = "Installs Rhaeto-Romance help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_RO]
+en-US = "Romanian"
+
+[STR_DESC_MODULE_HELPPACK_RO]
+en-US = "Installs Romanian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SQ]
+en-US = "Albanian"
+
+[STR_DESC_MODULE_HELPPACK_SQ]
+en-US = "Installs Albanian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UR]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_HELPPACK_UR]
+en-US = "Installs Urdu help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ID]
+en-US = "Indonesian"
+
+[STR_DESC_MODULE_HELPPACK_ID]
+en-US = "Installs Indonesian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_HELPPACK_UK]
+en-US = "Installs Ukrainian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BE]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_HELPPACK_BE]
+en-US = "Installs Belarusian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SL]
+en-US = "Slovenian"
+
+[STR_DESC_MODULE_HELPPACK_SL]
+en-US = "Installs Slovenian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_LV]
+en-US = "Latvian"
+
+[STR_DESC_MODULE_HELPPACK_LV]
+en-US = "Installs Latvian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_LT]
+en-US = "Lithuanian"
+
+[STR_DESC_MODULE_HELPPACK_LT]
+en-US = "Installs Lithuanian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_HY]
+en-US = "Armenian"
+
+[STR_DESC_MODULE_HELPPACK_HY]
+en-US = "Installs Armenian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EU]
+en-US = "Basque"
+
+[STR_DESC_MODULE_HELPPACK_EU]
+en-US = "Installs Basque help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MK]
+en-US = "Macedonian"
+
+[STR_DESC_MODULE_HELPPACK_MK]
+en-US = "Installs Macedonian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MT]
+en-US = "Maltese"
+
+[STR_DESC_MODULE_HELPPACK_MT]
+en-US = "Installs Maltese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_CY]
+en-US = "Welsh"
+
+[STR_DESC_MODULE_HELPPACK_CY]
+en-US = "Installs Welsh help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GL]
+en-US = "Galician"
+
+[STR_DESC_MODULE_HELPPACK_GL]
+en-US = "Installs Galician help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SH_YU]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_HELPPACK_SH_YU]
+en-US = "Installs Serbian (Latin) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SH]
+en-US = "Serbian (Latin)"
+
+[STR_DESC_MODULE_HELPPACK_SH]
+en-US = "Installs Serbian (Latin) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GA]
+en-US = "Irish"
+
+[STR_DESC_MODULE_HELPPACK_GA]
+en-US = "Installs Irish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SR_CS]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_HELPPACK_SR_CS]
+en-US = "Installs Serbian (Cyrillic) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SR]
+en-US = "Serbian (Cyrillic)"
+
+[STR_DESC_MODULE_HELPPACK_SR]
+en-US = "Installs Serbian (Cyrillic) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BS]
+en-US = "Bosnian"
+
+[STR_DESC_MODULE_HELPPACK_BS]
+en-US = "Installs Bosnian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AS_IN]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_HELPPACK_AS_IN]
+en-US = "Installs Assamese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AST]
+en-US = "Asturian"
+
+[STR_DESC_MODULE_HELPPACK_AST]
+en-US = "Installs Asturian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_RW]
+en-US = "Kinyarwanda"
+
+[STR_DESC_MODULE_HELPPACK_RW]
+en-US = "Installs Kinyarwanda help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SA]
+en-US = "Sanskrit"
+
+[STR_DESC_MODULE_HELPPACK_SA]
+en-US = "Installs Sanskrit help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_FA]
+en-US = "Farsi"
+
+[STR_DESC_MODULE_HELPPACK_FA]
+en-US = "Installs Farsi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_FO]
+en-US = "Faroese"
+
+[STR_DESC_MODULE_HELPPACK_FO]
+en-US = "Installs Faroese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SB]
+en-US = "Sorbian"
+
+[STR_DESC_MODULE_HELPPACK_SB]
+en-US = "Installs Sorbian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TT]
+en-US = "Tatar"
+
+[STR_DESC_MODULE_HELPPACK_TT]
+en-US = "Installs Tatar help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TS]
+en-US = "Tsonga"
+
+[STR_DESC_MODULE_HELPPACK_TS]
+en-US = "Installs Tsonga help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_YI]
+en-US = "Yiddish"
+
+[STR_DESC_MODULE_HELPPACK_YI]
+en-US = "Installs Yiddish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_HELPPACK_BR]
+en-US = "Installs Breton help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_NR]
+en-US = "Ndebele South"
+
+[STR_DESC_MODULE_HELPPACK_NR]
+en-US = "Installs Ndebele South help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SS]
+en-US = "Swazi"
+
+[STR_DESC_MODULE_HELPPACK_SS]
+en-US = "Installs Swazi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_VE]
+en-US = "Venda"
+
+[STR_DESC_MODULE_HELPPACK_VE]
+en-US = "Installs Venda help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KN]
+en-US = "Kannada"
+
+[STR_DESC_MODULE_HELPPACK_KN]
+en-US = "Installs Kannada help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MS]
+en-US = "Malay (Malaysian)"
+
+[STR_DESC_MODULE_HELPPACK_MS]
+en-US = "Installs Malay (Malaysian) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TG]
+en-US = "Tajik"
+
+[STR_DESC_MODULE_HELPPACK_TG]
+en-US = "Installs Tajik help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KU]
+en-US = "Kurdish"
+
+[STR_DESC_MODULE_HELPPACK_KU]
+en-US = "Installs Kurdish help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DZ]
+en-US = "Dzongkha"
+
+[STR_DESC_MODULE_HELPPACK_DZ]
+en-US = "Installs Dzongkha help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KA]
+en-US = "Georgian"
+
+[STR_DESC_MODULE_HELPPACK_KA]
+en-US = "Installs Georgian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EO]
+en-US = "Esperanto"
+
+[STR_DESC_MODULE_HELPPACK_EO]
+en-US = "Installs Esperanto help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GU]
+en-US = "Gujarati"
+
+[STR_DESC_MODULE_HELPPACK_GU]
+en-US = "Installs Gujarati help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EN_ZA]
+en-US = "English (South Africa)"
+
+[STR_DESC_MODULE_HELPPACK_EN_ZA]
+en-US = "Installs English (South Africa) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_EN_GB]
+en-US = "English (United Kingdom)"
+
+[STR_DESC_MODULE_HELPPACK_EN_GB]
+en-US = "Installs English (United Kingdom) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UR_IN]
+en-US = "Urdu"
+
+[STR_DESC_MODULE_HELPPACK_UR_IN]
+en-US = "Installs Urdu help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ML_IN]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_HELPPACK_ML_IN]
+en-US = "Installs Malayalam help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TE_IN]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_HELPPACK_TE_IN]
+en-US = "Installs Telugu help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TI_ER]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_HELPPACK_TI_ER]
+en-US = "Installs Tigrinya help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UZ]
+en-US = "Uzbek"
+
+[STR_DESC_MODULE_HELPPACK_UZ]
+en-US = "Installs Uzbek help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MN]
+en-US = "Mongolian"
+
+[STR_DESC_MODULE_HELPPACK_MN]
+en-US = "Installs Mongolian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_HELPPACK_MY]
+en-US = "Installs Burmese (Myanmar) help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BO]
+en-US = "Tibetan"
+
+[STR_DESC_MODULE_HELPPACK_BO]
+en-US = "Installs Tibetan help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_OC]
+en-US = "Occitan"
+
+[STR_DESC_MODULE_HELPPACK_OC]
+en-US = "Installs Occitan help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_OM]
+en-US = "Oromo"
+
+[STR_DESC_MODULE_HELPPACK_OM]
+en-US = "Installs Oromo help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SI]
+en-US = "Sinhala"
+
+[STR_DESC_MODULE_HELPPACK_SI]
+en-US = "Installs Sinhala help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_UG]
+en-US = "Uyghur"
+
+[STR_DESC_MODULE_HELPPACK_UG]
+en-US = "Installs Uyghur help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_AS]
+en-US = "Assamese"
+
+[STR_DESC_MODULE_HELPPACK_AS]
+en-US = "Installs Assamese help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_BRX]
+en-US = "Bodo"
+
+[STR_DESC_MODULE_HELPPACK_BRX]
+en-US = "Installs Bodo help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_DGO]
+en-US = "Dogri"
+
+[STR_DESC_MODULE_HELPPACK_DGO]
+en-US = "Installs Dogri help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_GD]
+en-US = "Scottish Gaelic"
+
+[STR_DESC_MODULE_HELPPACK_GD]
+en-US = "Installs Scottish Gaelic help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_HELPPACK_KK]
+en-US = "Installs Kazakh help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KOK]
+en-US = "Konkani"
+
+[STR_DESC_MODULE_HELPPACK_KOK]
+en-US = "Installs Konkani help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KS]
+en-US = "Kashmiri"
+
+[STR_DESC_MODULE_HELPPACK_KS]
+en-US = "Installs Kashmiri help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_KY]
+en-US = "Kyrgyz"
+
+[STR_DESC_MODULE_HELPPACK_KY]
+en-US = "Installs Kyrgyz help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MAI]
+en-US = "Maithili"
+
+[STR_DESC_MODULE_HELPPACK_MAI]
+en-US = "Installs Maithili help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_ML]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_HELPPACK_ML]
+en-US = "Installs Malayalam help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_MNI]
+en-US = "Manipuri"
+
+[STR_DESC_MODULE_HELPPACK_MNI]
+en-US = "Installs Manipuri help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PAP]
+en-US = "Papiamento"
+
+[STR_DESC_MODULE_HELPPACK_PAP]
+en-US = "Installs Papiamento help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_PS]
+en-US = "Pashto"
+
+[STR_DESC_MODULE_HELPPACK_PS]
+en-US = "Installs Pashto help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SA_IN]
+en-US = "Sanskrit (India)"
+
+[STR_DESC_MODULE_HELPPACK_SA_IN]
+en-US = "Installs Sanskrit help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SAT]
+en-US = "Santali"
+
+[STR_DESC_MODULE_HELPPACK_SAT]
+en-US = "Installs Santali help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SC]
+en-US = "Sardinian"
+
+[STR_DESC_MODULE_HELPPACK_SC]
+en-US = "Installs Sardinian help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_SD]
+en-US = "Sindhi"
+
+[STR_DESC_MODULE_HELPPACK_SD]
+en-US = "Installs Sindhi help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TE]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_HELPPACK_TE]
+en-US = "Installs Telugu help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_TI]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_HELPPACK_TI]
+en-US = "Installs Tigrinya help in %PRODUCTNAME %PRODUCTVERSION"
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index bba74c8dd56f..4cf3c5825b59 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -27,6 +27,52 @@
 
 #include "macros.inc"
 
+#ifdef AIX
+#ifndef SYSTEM_CURL
+Unixlink gid_Unixlink_File_Lib_Curl
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libcurl,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(libcurl,UNXSUFFIX,.3));
+End
+#endif
+#ifndef SYSTEM_REDLAND
+Unixlink gid_Unixlink_File_Lib_Raptor
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libraptor,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(libraptor,UNXSUFFIX,.1));
+End
+
+Unixlink gid_Unixlink_File_Lib_Rasqal
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(librasqal,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(librasqal,UNXSUFFIX,.1));
+End
+
+Unixlink gid_Unixlink_File_Lib_Rdf
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(librdf,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(librdf,UNXSUFFIX,.0));
+End
+#endif
+#ifndef SYSTEM_LIBXSLT
+Unixlink gid_Unixlink_File_Lib_Xslt
+    BIN_FILE_BODY;
+    Dir = SCP2_OOO_BIN_DIR;
+    Name = STRING(CONCAT2(libxslt,UNXSUFFIX));
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = STRING(CONCAT3(libxslt,UNXSUFFIX,.1));
+End
+#endif
+#endif
+
 Module gid_Module_Root_Files_2
     PackageInfo = "packinfo_office.txt";
 	ParentID = gid_Module_Root;
@@ -37,8 +83,6 @@ Module gid_Module_Root_Files_2
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
 	Files = (gid_File_Bin_Cde_Open_Url,
-	gid_File_Bin_Gnome_Open_Url,
-	gid_File_Bin_Gnome_Open_Url_Bin,
 	gid_File_Bin_Kde_Open_Url,
 	gid_File_Bin_Open_Url,
 	gid_File_Bin_Pagein,
@@ -91,7 +135,6 @@ Module gid_Module_Root_Files_3
 	gid_File_Jar_Hsqldb,
 	gid_File_Jar_Hsqldb_Sdbc,
 	gid_File_Jar_Accessbridge,
-	gid_File_Jar_Js,
 	gid_File_Jar_Officebean,
 	gid_File_Jar_Report,
 	gid_File_Jar_Table,
@@ -104,9 +147,7 @@ Module gid_Module_Root_Files_3
 	gid_File_Jar_Commonwizards,
 	gid_File_Jar_Sandbox,
 	gid_File_Jar_Scriptframework,
-	gid_File_Jar_Scriptproviderforbeanshell,
 	gid_File_Jar_Scriptproviderforjava,
-	gid_File_Jar_Scriptproviderforjavascript,
 	gid_File_Jar_Xml_Apis,
 	gid_File_Jar_Bsh,
 	gid_File_Jar_Classes,
@@ -213,7 +254,7 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Svx,
 	gid_File_Lib_AVMedia,
 	gid_File_Lib_AVMediaWin,
-	gid_File_Lib_AVMediaGst,
+    gid_File_Lib_AVMediaGStreamer,
 	gid_File_Lib_BaseGfx,
 	gid_File_Lib_Sysdtrans,
 	gid_File_Lib_Sw,
@@ -233,9 +274,9 @@ Module gid_Module_Root_Files_4
 	gid_File_Lib_Xof,
 	gid_File_Lib_Xsltdlg,
 	gid_File_Lib_Xsltfilter,
+	gid_File_Lib_Odfflatxml,
 	gid_File_Lib_Zip,
 	gid_File_Lib_Vclplug_Gen,
-	gid_File_Lib_Vclplug_Gtk,
 	gid_File_Lib_Vclplug_Kde,
 	gid_File_Lib_Vclplug_Kde4,
 	gid_File_Lib_Vclplug_Svp,
@@ -303,11 +344,11 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Adabas,
 	gid_File_Lib_Cached1,
 	gid_File_Lib_Curl,
+	gid_Unixlink_File_Lib_Curl,
 	gid_File_Lib_Db,
 	gid_File_Lib_Dbpool,
 	gid_File_Lib_Embobj,
 	gid_File_Lib_Emboleobj,
-	gid_File_Lib_Evoab_2,
 	gid_File_Lib_Kab_1,
     gid_File_Lib_Kab_Drv_1,
 	gid_File_Lib_Macab_1,
@@ -315,7 +356,6 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Evtatt,
 	gid_File_Lib_Fileacc,
 	gid_File_Lib_Filterconfig1,
-	gid_File_Lib_Fps_Gnome,
 	gid_File_Lib_Dbodbcbase,
 	gid_File_Lib_I18npool,
 	gid_File_Lib_I18npaper,
@@ -355,15 +395,18 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Tab,
 	gid_File_Lib_Tab2,
 	gid_File_Lib_Unoxml,
-	gid_File_Lib_Vos,
 	gid_File_Lib_Localebe,
 	gid_File_Lib_Migrationoo2,
+	gid_File_Lib_Migrationoo3,
 	gid_File_Lib_Syssh,
 	gid_File_Ucptdoc1,
 	gid_File_Ucpexpand1,
 	gid_File_Lib_Raptor,
+	gid_Unixlink_File_Lib_Raptor,
 	gid_File_Lib_Rasqal,
+	gid_Unixlink_File_Lib_Rasqal,
 	gid_File_Lib_Rdf,
+	gid_Unixlink_File_Lib_Rdf,
 	gid_File_Lib_Unordf,
 	gid_File_Lib_Sndfile,
 	gid_File_Lib_Tvhlp1,
@@ -377,6 +420,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Ucphier1,
 	gid_File_Lib_Ucppkg1,
 	gid_File_Lib_Xslt,
+	gid_Unixlink_File_Lib_Xslt,
 	gid_File_Lib_LibXMLSec_xmlsecnss,
 	gid_File_Lib_LibXMLSec_xmlseccore,
 	gid_File_Lib_LibXMLSec_xmlsecmscrypto,
@@ -408,8 +452,10 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Fps,
 	gid_File_Lib_Ftransl,
 	gid_File_Lib_Lngpckinsthlp,
+#ifdef ENABLE_LOMENUBAR
+	gid_File_Lib_Lomenubar,
+#endif
     gid_File_Lib_sn_tools,
-    gid_File_Lib_relnotes,
     GID_FILE_LIB_WPD,
     gid_File_Lib_Mingw_GccS,
     gid_File_Lib_Mingw_Stdcpp,
@@ -445,6 +491,11 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Assembly,
 	gid_File_Lib_Policy_Cli_Oootypes_Config);
+    Unixlinks = (gid_Unixlink_File_Lib_Curl,
+	gid_Unixlink_File_Lib_Raptor,
+	gid_Unixlink_File_Lib_Rasqal,
+	gid_Unixlink_File_Lib_Rdf,
+	gid_Unixlink_File_Lib_Xslt);
 End
 
 Module gid_Module_Root_Files_6
@@ -479,19 +530,9 @@ Module gid_Module_Root_Files_6
 	gid_File_Extra_Gallwwwgraf,
 	gid_File_Extra_Migration,
 	gid_File_Extra_Migration_Lang_Multi,
+	gid_File_Extra_Tpllayoutimpr,
 	gid_File_Extra_Tplwizbitmap,
 	gid_File_Extra_Tplwizletter,
-	gid_File_Extra_Tplwizletter_en_US,
-	gid_File_Extra_Tplwizletter_de,
-	gid_File_Extra_Tplwizletter_fr,
-	gid_File_Extra_Tplwizletter_es,
-	gid_File_Extra_Tplwizletter_it,
-	gid_File_Extra_Tplwizletter_pt_BR,
-	gid_File_Extra_Tplwizletter_sv,
-	gid_File_Extra_Tplwizletter_ja,
-	gid_File_Extra_Tplwizletter_ko,
-	gid_File_Extra_Tplwizletter_zh_CN,
-	gid_File_Extra_Tplwizletter_zh_TW,
 	gid_File_Extra_Tplwizmemo_Lang,
 	gid_File_Extra_Autotextuser_Lang,
 	gid_File_Extra_Dir_Fonts,
@@ -654,6 +695,7 @@ Module gid_Module_Root_Files_6
     gid_File_Share_Registry_Main_Xcd,
     gid_File_Share_Registry_Forcedefault_Xcd,
 	gid_File_Pymailmerge,
+	gid_File_Pymailmerge_msgbox,
     gid_File_Xsl_Common_Measure_Conversion,
 	gid_File_Xsl_Common_Math_Functions,
 	gid_File_Xsl_Export_Common_Body,
@@ -738,13 +780,23 @@ Module gid_Module_Root_Files_Images
 	Sortkey = "2050";
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Images_Zip,
+	Files = (
+#ifdef THEME_DEFAULT
+	     gid_File_Images_Zip,
+#endif
+#ifdef THEME_CRYSTAL
              gid_File_ImagesCrystal_Zip,
+#endif
+#ifdef THEME_OXYGEN
              gid_File_ImagesOxygen_Zip,
+#endif
+#ifdef THEME_HICONTRAST
              gid_File_ImagesHicontrast_Zip,
-             gid_File_ImagesIndustrial_Zip,
-             gid_File_ImagesTango_Zip,
-             gid_File_ImagesClassic8_Zip);
+#endif
+#ifdef THEME_TANGO
+             gid_File_ImagesTango_Zip
+#endif
+	);
 End
 
 #ifndef WITHOUT_FONTS
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 0769df7ed214..60ee02b8b760 100755..100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -31,21 +31,17 @@ Module gid_Module_Langpack_Basis_Template
     Description = "gid_Module_Langpack_Root_Template";
     Styles = (TEMPLATEMODULE);
     Files = (gid_File_Extra_Autotextshare_Lang,
-             gid_File_Extra_Palettes_Lang,
-             gid_File_Extra_Tpllayoutimpr_Lang,
              gid_File_Extra_Tplpresntimpr_Lang,
              gid_File_Extra_Tplwizagenda_Lang,
              gid_File_Extra_Tplwizdesktop_Lang,
              gid_File_Extra_Tplwizfax_Lang,
-             gid_File_Extra_Tplwizletter_Lang,
              gid_File_Extra_Tplwizreport_Lang,
              gid_File_Extra_Tplwizstyles_Lang,
-             gid_File_Extra_Wordbook,
-             gid_File_Extra_Wordbook_Lang,
              gid_File_Registry_Filter_Zip,
              gid_File_Registry_Lang,
              gid_File_Registry_Spool_Langpack_Lang,
              gid_File_Share_Registry_Ctl_Xcd,
+             gid_File_Share_Registry_Ctlseqcheck_Xcd,
              gid_File_InfoPlist_Lang);
     Dirs = (gid_Dir_Samples_Language);
 End
@@ -108,17 +104,6 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_UpdChk,
              gid_File_Res_Upd);
 End
-
-Module gid_Module_Langpack_Help_Template
-    ParentID = gid_Module_Langpack_Languageroot;
-    Name = "gid_Module_Langpack_Help_Template";
-    Description = "gid_Module_Langpack_Help_Template";
-    Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Common_Zip,
-             gid_File_Help_Sbasic_Zip,
-             gid_File_Help_Schart_Zip);
-End
-
 Module gid_Module_Langpack_Fonts_Template
     ParentID = gid_Module_Langpack_Languageroot;
     Name = "gid_Module_Langpack_Fonts_Template";
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 591c84a6a939..7e1f9e6e8d3e 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -26,691 +26,823 @@
  ************************************************************************/
  
 [STR_NAME_MODULE_ROOT_LANGPACK]
-en-US = "Additional language packs"
+en-US = "Additional user interface languages"
 
 [STR_DESC_MODULE_ROOT_LANGPACK]
-en-US = "Additional language packs"
+en-US = "Additional user interface languages"
 
 [STR_NAME_MODULE_LANGPACK_EN_US]
 en-US = "English"
 
 [STR_DESC_MODULE_LANGPACK_EN_US]
-en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the English user interface"
 
 [STR_NAME_MODULE_LANGPACK_DE]
 en-US = "German"
 
 [STR_DESC_MODULE_LANGPACK_DE]
-en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the German user interface"
 
 [STR_NAME_MODULE_LANGPACK_FR]
 en-US = "French"
 
 [STR_DESC_MODULE_LANGPACK_FR]
-en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the French user interface"
 
 [STR_NAME_MODULE_LANGPACK_IT]
 en-US = "Italian"
 
 [STR_DESC_MODULE_LANGPACK_IT]
-en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Italian user interface"
 
 [STR_NAME_MODULE_LANGPACK_ES]
 en-US = "Spanish"
 
 [STR_DESC_MODULE_LANGPACK_ES]
-en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Spanish user interface"
 
 [STR_NAME_MODULE_LANGPACK_SV]
 en-US = "Swedish"
 
 [STR_DESC_MODULE_LANGPACK_SV]
-en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Swedish user interface"
 
 [STR_NAME_MODULE_LANGPACK_PT]
 en-US = "Portuguese"
 
 [STR_DESC_MODULE_LANGPACK_PT]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Portuguese user interface"
 
 [STR_NAME_MODULE_LANGPACK_PT_BR]
 en-US = "Portuguese (Brazil)"
 
 [STR_DESC_MODULE_LANGPACK_PT_BR]
-en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Portuguese user interface"
 
 [STR_NAME_MODULE_LANGPACK_JA]
 en-US = "Japanese"
 
 [STR_DESC_MODULE_LANGPACK_JA]
-en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Japanese user interface"
 
 [STR_NAME_MODULE_LANGPACK_KO]
 en-US = "Korean"
 
 [STR_DESC_MODULE_LANGPACK_KO]
-en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Korean user interface"
 
 [STR_NAME_MODULE_LANGPACK_ZH_CN]
 en-US = "Chinese (simplified)"
 
 [STR_DESC_MODULE_LANGPACK_ZH_CN]
-en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Chinese (simplified) user interface"
 
 [STR_NAME_MODULE_LANGPACK_ZH_TW]
 en-US = "Chinese (traditional)"
 
 [STR_DESC_MODULE_LANGPACK_ZH_TW]
-en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Chinese (traditional) user interface"
 
 [STR_NAME_MODULE_LANGPACK_NL]
 en-US = "Dutch"
 
 [STR_DESC_MODULE_LANGPACK_NL]
-en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Dutch user interface"
 
 [STR_NAME_MODULE_LANGPACK_HU]
 en-US = "Hungarian"
 
 [STR_DESC_MODULE_LANGPACK_HU]
-en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Hungarian user interface"
 
 [STR_NAME_MODULE_LANGPACK_PL]
 en-US = "Polish"
 
 [STR_DESC_MODULE_LANGPACK_PL]
-en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Polish user interface"
 
 [STR_NAME_MODULE_LANGPACK_RU]
 en-US = "Russian"
 
 [STR_DESC_MODULE_LANGPACK_RU]
-en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Russian user interface"
 
 [STR_NAME_MODULE_LANGPACK_TR]
 en-US = "Turkish"
 
 [STR_DESC_MODULE_LANGPACK_TR]
-en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Turkish user interface"
 
 [STR_NAME_MODULE_LANGPACK_EL]
 en-US = "Greek"
 
 [STR_DESC_MODULE_LANGPACK_EL]
-en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Greek user interface"
 
 [STR_NAME_MODULE_LANGPACK_TH]
 en-US = "Thai"
 
 [STR_DESC_MODULE_LANGPACK_TH]
-en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Thai user interface"
 
 [STR_NAME_MODULE_LANGPACK_CS]
 en-US = "Czech"
 
 [STR_DESC_MODULE_LANGPACK_CS]
-en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Czech user interface"
 
 [STR_NAME_MODULE_LANGPACK_SK]
 en-US = "Slovak"
 
 [STR_DESC_MODULE_LANGPACK_SK]
-en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Slovak user interface"
 
 [STR_NAME_MODULE_LANGPACK_HR]
 en-US = "Croatian"
 
 [STR_DESC_MODULE_LANGPACK_HR]
-en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Croatian user interface"
 
 [STR_NAME_MODULE_LANGPACK_ET]
 en-US = "Estonian"
 
 [STR_DESC_MODULE_LANGPACK_ET]
-en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Estonian user interface"
 
 [STR_NAME_MODULE_LANGPACK_VI]
 en-US = "Vietnamese"
 
 [STR_DESC_MODULE_LANGPACK_VI]
-en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Vietnamese user interface"
 
 [STR_NAME_MODULE_LANGPACK_BG]
 en-US = "Bulgarian"
 
 [STR_DESC_MODULE_LANGPACK_BG]
-en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Bulgarian user interface"
 
 [STR_NAME_MODULE_LANGPACK_KM]
 en-US = "Khmer"
 
 [STR_DESC_MODULE_LANGPACK_KM]
-en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Khmer user interface"
 
 [STR_NAME_MODULE_LANGPACK_PA_IN]
 en-US = "Punjabi"
 
 [STR_DESC_MODULE_LANGPACK_PA_IN]
-en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Punjabi user interface"
 
 [STR_NAME_MODULE_LANGPACK_GU_IN]
 en-US = "Gujarati"
 
 [STR_DESC_MODULE_LANGPACK_GU_IN]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Gujarati user interface"
 
 [STR_NAME_MODULE_LANGPACK_TA]
 en-US = "Tamil"
 
 [STR_DESC_MODULE_LANGPACK_TA]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tamil user interface"
 
 [STR_NAME_MODULE_LANGPACK_TA_IN]
 en-US = "Tamil"
 
 [STR_DESC_MODULE_LANGPACK_TA_IN]
-en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tamil user interface"
 
 [STR_NAME_MODULE_LANGPACK_HI]
 en-US = "Hindi"
 
 [STR_DESC_MODULE_LANGPACK_HI]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Hindi user interface"
 
 [STR_NAME_MODULE_LANGPACK_HI_IN]
 en-US = "Hindi"
 
 [STR_DESC_MODULE_LANGPACK_HI_IN]
-en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Hindi user interface"
 
 [STR_NAME_MODULE_LANGPACK_ST]
 en-US = "Southern Sotho (Sutu)"
 
 [STR_DESC_MODULE_LANGPACK_ST]
-en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Southern Sotho (Sutu) user interface"
 
 [STR_NAME_MODULE_LANGPACK_TN]
 en-US = "Tswana"
 
 [STR_DESC_MODULE_LANGPACK_TN]
-en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tswana user interface"
 
 [STR_NAME_MODULE_LANGPACK_XH]
 en-US = "Xhosa"
 
 [STR_DESC_MODULE_LANGPACK_XH]
-en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Xhosa user interface"
 
 [STR_NAME_MODULE_LANGPACK_ZU]
 en-US = "Zulu"
 
 [STR_DESC_MODULE_LANGPACK_ZU]
-en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Zulu user interface"
 
 [STR_NAME_MODULE_LANGPACK_AF]
 en-US = "Afrikaans"
 
 [STR_DESC_MODULE_LANGPACK_AF]
-en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Afrikaans user interface"
 
 [STR_NAME_MODULE_LANGPACK_SW]
 en-US = "Swahili"
 
 [STR_DESC_MODULE_LANGPACK_SW]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Swahili user interface"
 
 [STR_NAME_MODULE_LANGPACK_SW_TZ]
 en-US = "Swahili"
 
 [STR_DESC_MODULE_LANGPACK_SW_TZ]
-en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Swahili user interface"
 
 [STR_NAME_MODULE_LANGPACK_LO]
 en-US = "Lao"
 
 [STR_DESC_MODULE_LANGPACK_LO]
-en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Lao user interface"
 
-[STR_NAME_MODULE_LANGPACK_NS]
+[STR_NAME_MODULE_LANGPACK_MY]
+en-US = "Burmese"
+
+[STR_DESC_MODULE_LANGPACK_MY]
+en-US = "Installs the Burmese (Myanmar) user interface"
+
+[STR_NAME_MODULE_LANGPACK_NSO]
 en-US = "Northern Sotho"
 
-[STR_DESC_MODULE_LANGPACK_NS]
-en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_NSO]
+en-US = "Installs the Northern Sotho user interface"
 
 [STR_NAME_MODULE_LANGPACK_BN]
 en-US = "Bengali"
 
 [STR_DESC_MODULE_LANGPACK_BN]
-en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Bengali user interface"
 
 [STR_NAME_MODULE_LANGPACK_BN_BD]
 en-US = "Bengali (Bangladesh)"
 
 [STR_DESC_MODULE_LANGPACK_BN_BD]
-en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Bengali (Bangladesh) user interface"
 
 [STR_NAME_MODULE_LANGPACK_BN_IN]
 en-US = "Bengali (India)"
 
 [STR_DESC_MODULE_LANGPACK_BN_IN]
-en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Bengali (India) user interface"
 
 [STR_NAME_MODULE_LANGPACK_OR]
 en-US = "Oriya"
 
 [STR_DESC_MODULE_LANGPACK_OR]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Oriya user interface"
 
 [STR_NAME_MODULE_LANGPACK_OR_IN]
 en-US = "Oriya"
 
 [STR_DESC_MODULE_LANGPACK_OR_IN]
-en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Oriya user interface"
 
 [STR_NAME_MODULE_LANGPACK_MR]
 en-US = "Marathi"
 
 [STR_DESC_MODULE_LANGPACK_MR]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Marathi user interface"
 
 [STR_NAME_MODULE_LANGPACK_MR_IN]
 en-US = "Marathi"
 
 [STR_DESC_MODULE_LANGPACK_MR_IN]
-en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Marathi user interface"
 
 [STR_NAME_MODULE_LANGPACK_NE]
 en-US = "Nepali"
 
 [STR_DESC_MODULE_LANGPACK_NE]
-en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Nepali user interface"
 
 [STR_NAME_MODULE_LANGPACK_AR]
 en-US = "Arabic"
 
 [STR_DESC_MODULE_LANGPACK_AR]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Arabic user interface"
 
 [STR_NAME_MODULE_LANGPACK_AR_SA]
 en-US = "Arabic"
 
 [STR_DESC_MODULE_LANGPACK_AR_SA]
-en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Arabic user interface"
 
 [STR_NAME_MODULE_LANGPACK_CA]
 en-US = "Catalan"
 
 [STR_DESC_MODULE_LANGPACK_CA]
-en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Catalan user interface"
+
+[STR_NAME_MODULE_LANGPACK_CA_XV]
+en-US = "Catalan (Valencian)"
+
+[STR_DESC_MODULE_LANGPACK_CA_XV]
+en-US = "Installs the Catalan (Valencian) user interface"
 
 [STR_NAME_MODULE_LANGPACK_DA]
 en-US = "Danish"
 
 [STR_DESC_MODULE_LANGPACK_DA]
-en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Danish user interface"
 
 [STR_NAME_MODULE_LANGPACK_FI]
 en-US = "Finnish"
 
 [STR_DESC_MODULE_LANGPACK_FI]
-en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Finnish user interface"
 
 [STR_NAME_MODULE_LANGPACK_HE]
 en-US = "Hebrew"
 
 [STR_DESC_MODULE_LANGPACK_HE]
-en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Hebrew user interface"
 
 [STR_NAME_MODULE_LANGPACK_IS]
 en-US = "Icelandic"
 
 [STR_DESC_MODULE_LANGPACK_IS]
-en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Icelandic user interface"
 
 [STR_NAME_MODULE_LANGPACK_NB]
 en-US = "Norwegian (Bokmål)"
 
 [STR_DESC_MODULE_LANGPACK_NB]
-en-US = "Installs Norwegian (Bokmål) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Norwegian (Bokmål) user interface"
 
 [STR_NAME_MODULE_LANGPACK_NN]
 en-US = "Norwegian (Nynorsk)"
 
 [STR_DESC_MODULE_LANGPACK_NN]
-en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Norwegian (Nynorsk) user interface"
 
 [STR_NAME_MODULE_LANGPACK_RM]
 en-US = "Rhaeto-Romance"
 
 [STR_DESC_MODULE_LANGPACK_RM]
-en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Rhaeto-Romance user interface"
 
 [STR_NAME_MODULE_LANGPACK_RO]
 en-US = "Romanian"
 
 [STR_DESC_MODULE_LANGPACK_RO]
-en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Romanian user interface"
 
 [STR_NAME_MODULE_LANGPACK_SQ]
 en-US = "Albanian"
 
 [STR_DESC_MODULE_LANGPACK_SQ]
-en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Albanian user interface"
 
 [STR_NAME_MODULE_LANGPACK_UR]
 en-US = "Urdu"
 
 [STR_DESC_MODULE_LANGPACK_UR]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Urdu user interface"
 
 [STR_NAME_MODULE_LANGPACK_ID]
 en-US = "Indonesian"
 
 [STR_DESC_MODULE_LANGPACK_ID]
-en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Indonesian user interface"
 
 [STR_NAME_MODULE_LANGPACK_UK]
 en-US = "Ukrainian"
 
 [STR_DESC_MODULE_LANGPACK_UK]
-en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Ukrainian user interface"
 
-[STR_NAME_MODULE_LANGPACK_BE_BY]
+[STR_NAME_MODULE_LANGPACK_BE]
 en-US = "Belarusian"
 
-[STR_DESC_MODULE_LANGPACK_BE_BY]
-en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_BE]
+en-US = "Installs the Belarusian user interface"
 
 [STR_NAME_MODULE_LANGPACK_SL]
 en-US = "Slovenian"
 
 [STR_DESC_MODULE_LANGPACK_SL]
-en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Slovenian user interface"
 
 [STR_NAME_MODULE_LANGPACK_LV]
 en-US = "Latvian"
 
 [STR_DESC_MODULE_LANGPACK_LV]
-en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Latvian user interface"
 
 [STR_NAME_MODULE_LANGPACK_LT]
 en-US = "Lithuanian"
 
 [STR_DESC_MODULE_LANGPACK_LT]
-en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Lithuanian user interface"
 
 [STR_NAME_MODULE_LANGPACK_HY]
 en-US = "Armenian"
 
 [STR_DESC_MODULE_LANGPACK_HY]
-en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Armenian user interface"
 
 [STR_NAME_MODULE_LANGPACK_EU]
 en-US = "Basque"
 
 [STR_DESC_MODULE_LANGPACK_EU]
-en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Basque user interface"
 
 [STR_NAME_MODULE_LANGPACK_MK]
 en-US = "Macedonian"
 
 [STR_DESC_MODULE_LANGPACK_MK]
-en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Macedonian user interface"
 
 [STR_NAME_MODULE_LANGPACK_MT]
 en-US = "Maltese"
 
 [STR_DESC_MODULE_LANGPACK_MT]
-en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Maltese user interface"
 
 [STR_NAME_MODULE_LANGPACK_CY]
 en-US = "Welsh"
 
 [STR_DESC_MODULE_LANGPACK_CY]
-en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Welsh user interface"
 
 [STR_NAME_MODULE_LANGPACK_GL]
 en-US = "Galician"
 
 [STR_DESC_MODULE_LANGPACK_GL]
-en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Galician user interface"
 
 [STR_NAME_MODULE_LANGPACK_SH_YU]
 en-US = "Serbian (Latin)"
 
 [STR_DESC_MODULE_LANGPACK_SH_YU]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Serbian (Latin) user interface"
 
 [STR_NAME_MODULE_LANGPACK_SH]
 en-US = "Serbian (Latin)"
 
 [STR_DESC_MODULE_LANGPACK_SH]
-en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Serbian (Latin) user interface"
 
 [STR_NAME_MODULE_LANGPACK_GA]
 en-US = "Irish"
 
 [STR_DESC_MODULE_LANGPACK_GA]
-en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Irish user interface"
 
 [STR_NAME_MODULE_LANGPACK_SR_CS]
 en-US = "Serbian (Cyrillic)"
 
 [STR_DESC_MODULE_LANGPACK_SR_CS]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Serbian (Cyrillic) user interface"
 
 [STR_NAME_MODULE_LANGPACK_SR]
 en-US = "Serbian (Cyrillic)"
 
 [STR_DESC_MODULE_LANGPACK_SR]
-en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Serbian (Cyrillic) user interface"
 
 [STR_NAME_MODULE_LANGPACK_BS]
 en-US = "Bosnian"
 
 [STR_DESC_MODULE_LANGPACK_BS]
-en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Bosnian user interface"
 
 [STR_NAME_MODULE_LANGPACK_AS_IN]
 en-US = "Assamese"
 
 [STR_DESC_MODULE_LANGPACK_AS_IN]
-en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Assamese user interface"
+
+[STR_NAME_MODULE_LANGPACK_AST]
+en-US = "Asturian"
+
+[STR_DESC_MODULE_LANGPACK_AST]
+en-US = "Installs the Asturian user interface"
 
 [STR_NAME_MODULE_LANGPACK_RW]
 en-US = "Kinyarwanda"
 
 [STR_DESC_MODULE_LANGPACK_RW]
-en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Kinyarwanda user interface"
 
 [STR_NAME_MODULE_LANGPACK_SA]
 en-US = "Sanskrit"
 
 [STR_DESC_MODULE_LANGPACK_SA]
-en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Sanskrit user interface"
 
 [STR_NAME_MODULE_LANGPACK_FA]
 en-US = "Farsi"
 
 [STR_DESC_MODULE_LANGPACK_FA]
-en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Farsi user interface"
 
 [STR_NAME_MODULE_LANGPACK_FO]
 en-US = "Faroese"
 
 [STR_DESC_MODULE_LANGPACK_FO]
-en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Faroese user interface"
 
 [STR_NAME_MODULE_LANGPACK_SB]
 en-US = "Sorbian"
 
 [STR_DESC_MODULE_LANGPACK_SB]
-en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Sorbian user interface"
 
 [STR_NAME_MODULE_LANGPACK_TT]
 en-US = "Tatar"
 
 [STR_DESC_MODULE_LANGPACK_TT]
-en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tatar user interface"
 
 [STR_NAME_MODULE_LANGPACK_TS]
 en-US = "Tsonga"
 
 [STR_DESC_MODULE_LANGPACK_TS]
-en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tsonga user interface"
 
 [STR_NAME_MODULE_LANGPACK_YI]
 en-US = "Yiddish"
 
 [STR_DESC_MODULE_LANGPACK_YI]
-en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Yiddish user interface"
 
 [STR_NAME_MODULE_LANGPACK_BR]
 en-US = "Breton"
 
 [STR_DESC_MODULE_LANGPACK_BR]
-en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Breton user interface"
 
 [STR_NAME_MODULE_LANGPACK_NR]
 en-US = "Ndebele South"
 
 [STR_DESC_MODULE_LANGPACK_NR]
-en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Ndebele South user interface"
 
 [STR_NAME_MODULE_LANGPACK_SS]
 en-US = "Swazi"
 
 [STR_DESC_MODULE_LANGPACK_SS]
-en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Swazi user interface"
 
 [STR_NAME_MODULE_LANGPACK_VE]
 en-US = "Venda"
 
 [STR_DESC_MODULE_LANGPACK_VE]
-en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Venda user interface"
 
 [STR_NAME_MODULE_LANGPACK_KN]
 en-US = "Kannada"
 
 [STR_DESC_MODULE_LANGPACK_KN]
-en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Kannada user interface"
 
 [STR_NAME_MODULE_LANGPACK_MS]
 en-US = "Malay (Malaysian)"
 
 [STR_DESC_MODULE_LANGPACK_MS]
-en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Malay (Malaysian) user interface"
 
 [STR_NAME_MODULE_LANGPACK_TG]
 en-US = "Tajik"
 
 [STR_DESC_MODULE_LANGPACK_TG]
-en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tajik user interface"
 
 [STR_NAME_MODULE_LANGPACK_KU]
 en-US = "Kurdish"
 
 [STR_DESC_MODULE_LANGPACK_KU]
-en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Kurdish user interface"
 
 [STR_NAME_MODULE_LANGPACK_DZ]
 en-US = "Dzongkha"
 
 [STR_DESC_MODULE_LANGPACK_DZ]
-en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Dzongkha user interface"
 
 [STR_NAME_MODULE_LANGPACK_KA]
 en-US = "Georgian"
 
 [STR_DESC_MODULE_LANGPACK_KA]
-en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Georgian user interface"
 
 [STR_NAME_MODULE_LANGPACK_EO]
 en-US = "Esperanto"
 
 [STR_DESC_MODULE_LANGPACK_EO]
-en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Esperanto user interface"
 
 [STR_NAME_MODULE_LANGPACK_GU]
 en-US = "Gujarati"
 
 [STR_DESC_MODULE_LANGPACK_GU]
-en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Gujarati user interface"
 
 [STR_NAME_MODULE_LANGPACK_EN_ZA]
 en-US = "English (South Africa)"
 
 [STR_DESC_MODULE_LANGPACK_EN_ZA]
-en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the English (South Africa) user interface"
 
 [STR_NAME_MODULE_LANGPACK_EN_GB]
 en-US = "English (United Kingdom)"
 
 [STR_DESC_MODULE_LANGPACK_EN_GB]
-en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the English (United Kingdom) user interface"
 
 [STR_NAME_MODULE_LANGPACK_UR_IN]
 en-US = "Urdu"
 
 [STR_DESC_MODULE_LANGPACK_UR_IN]
-en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Urdu user interface"
 
 [STR_NAME_MODULE_LANGPACK_ML_IN]
 en-US = "Malayalam"
 
 [STR_DESC_MODULE_LANGPACK_ML_IN]
-en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Malayalam user interface"
 
 [STR_NAME_MODULE_LANGPACK_TE_IN]
 en-US = "Telugu"
 
 [STR_DESC_MODULE_LANGPACK_TE_IN]
-en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Telugu user interface"
 
 [STR_NAME_MODULE_LANGPACK_TI_ER]
 en-US = "Tigrinya"
 
 [STR_DESC_MODULE_LANGPACK_TI_ER]
-en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Tigrinya user interface"
 
 [STR_NAME_MODULE_LANGPACK_UZ]
 en-US = "Uzbek"
 
 [STR_DESC_MODULE_LANGPACK_UZ]
-en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Uzbek user interface"
 
 [STR_NAME_MODULE_LANGPACK_MN]
 en-US = "Mongolian"
 
 [STR_DESC_MODULE_LANGPACK_MN]
-en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Mongolian user interface"
+
+[STR_NAME_MODULE_LANGPACK_BO]
+en-US = "Tibetan"
+
+[STR_DESC_MODULE_LANGPACK_BO]
+en-US = "Installs the Tibetan user interface"
 
 [STR_NAME_MODULE_LANGPACK_OC]
 en-US = "Occitan"
 
 [STR_DESC_MODULE_LANGPACK_OC]
-en-US = "Installs Occitan support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Occitan user interface"
 
-[STR_NAME_MODULE_LANGPACK_UG]
-en-US = "Uighur"
+[STR_NAME_MODULE_LANGPACK_OM]
+en-US = "Oromo"
 
-[STR_DESC_MODULE_LANGPACK_UG]
-en-US = "Installs Uighur support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_OM]
+en-US = "Installs the Oromo user interface"
 
 [STR_NAME_MODULE_LANGPACK_SI]
 en-US = "Sinhala"
 
 [STR_DESC_MODULE_LANGPACK_SI]
-en-US = "Installs Sinhala support in %PRODUCTNAME %PRODUCTVERSION"
+en-US = "Installs the Sinhala user interface"
 
-[STR_NAME_MODULE_LANGPACK_OM]
-en-US = "Oromo"
+[STR_NAME_MODULE_LANGPACK_UG]
+en-US = "Uyghur"
 
-[STR_DESC_MODULE_LANGPACK_OM]
-en-US = "Installs Oromo support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_UG]
+en-US = "Installs the Uyghur user interface"
 
-[STR_NAME_MODULE_LANGPACK_AST]
-en-US = "Asturian"
+[STR_NAME_MODULE_LANGPACK_AS]
+en-US = "Assamese"
 
-[STR_DESC_MODULE_LANGPACK_AST]
-en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_AS]
+en-US = "Installs the Assamese user interface"
+
+[STR_NAME_MODULE_LANGPACK_BRX]
+en-US = "Bodo"
+
+[STR_DESC_MODULE_LANGPACK_BRX]
+en-US = "Installs the Bodo user interface"
+
+[STR_NAME_MODULE_LANGPACK_DGO]
+en-US = "Dogri"
+
+[STR_DESC_MODULE_LANGPACK_DGO]
+en-US = "Installs the Dogri user interface"
+
+[STR_NAME_MODULE_LANGPACK_GD]
+en-US = "Scottish Gaelic"
+
+[STR_DESC_MODULE_LANGPACK_GD]
+en-US = "Installs the Scottish Gaelic user interface"
+
+[STR_NAME_MODULE_LANGPACK_KK]
+en-US = "Kazakh"
+
+[STR_DESC_MODULE_LANGPACK_KK]
+en-US = "Installs the Kazakh user interface"
+
+[STR_NAME_MODULE_LANGPACK_KOK]
+en-US = "Konkani"
+
+[STR_DESC_MODULE_LANGPACK_KOK]
+en-US = "Installs the Konkani user interface"
+
+[STR_NAME_MODULE_LANGPACK_KS]
+en-US = "Kashmiri"
+
+[STR_DESC_MODULE_LANGPACK_KS]
+en-US = "Installs the Kashmiri user interface"
+
+[STR_NAME_MODULE_LANGPACK_KY]
+en-US = "Kyrgyz"
+
+[STR_DESC_MODULE_LANGPACK_KY]
+en-US = "Installs the Kyrgyz user interface"
+
+[STR_NAME_MODULE_LANGPACK_MAI]
+en-US = "Maithili"
+
+[STR_DESC_MODULE_LANGPACK_MAI]
+en-US = "Installs the Maithili user interface"
+
+[STR_NAME_MODULE_LANGPACK_ML]
+en-US = "Malayalam"
+
+[STR_DESC_MODULE_LANGPACK_ML]
+en-US = "Installs the Malayalam user interface"
+
+[STR_NAME_MODULE_LANGPACK_MNI]
+en-US = "Manipuri"
+
+[STR_DESC_MODULE_LANGPACK_MNI]
+en-US = "Installs the Manipuri user interface"
+
+[STR_NAME_MODULE_LANGPACK_PAP]
+en-US = "Papiamento"
+
+[STR_DESC_MODULE_LANGPACK_PAP]
+en-US = "Installs the Papiamento user interface"
+
+[STR_NAME_MODULE_LANGPACK_PS]
+en-US = "Pashto"
+
+[STR_DESC_MODULE_LANGPACK_PS]
+en-US = "Installs the Pashto user interface"
+
+[STR_NAME_MODULE_LANGPACK_SA_IN]
+en-US = "Sanskrit (India)"
+
+[STR_DESC_MODULE_LANGPACK_SA_IN]
+en-US = "Installs the Sanskrit user interface"
+
+[STR_NAME_MODULE_LANGPACK_SAT]
+en-US = "Santali"
+
+[STR_DESC_MODULE_LANGPACK_SAT]
+en-US = "Installs the Santali user interface"
+
+[STR_NAME_MODULE_LANGPACK_SC]
+en-US = "Sardinian"
+
+[STR_DESC_MODULE_LANGPACK_SC]
+en-US = "Installs the Sardinian user interface"
+
+[STR_NAME_MODULE_LANGPACK_SD]
+en-US = "Sindhi"
+
+[STR_DESC_MODULE_LANGPACK_SD]
+en-US = "Installs the Sindhi user interface"
+
+[STR_NAME_MODULE_LANGPACK_TE]
+en-US = "Telugu"
+
+[STR_DESC_MODULE_LANGPACK_TE]
+en-US = "Installs the Telugu user interface"
+
+[STR_NAME_MODULE_LANGPACK_TI]
+en-US = "Tigrinya"
+
+[STR_DESC_MODULE_LANGPACK_TI]
+en-US = "Installs the Tigrinya user interface"
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index dcd29c2ed31d..293878bc9e71 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -58,13 +58,24 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_Af
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AF );
-	Files = (gid_File_Extension_Dictionary_Af);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Af);
+    InstallOrder = "2000";
     Sortkey = "510";
-	Spellcheckerlanguage = "af";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "af";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Br
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BR );
+    Files = (gid_File_Extension_Dictionary_Br);
+    InstallOrder = "2000";
+    Sortkey = "515";
+    Spellcheckerlanguage = "br";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Ca
@@ -80,35 +91,35 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_Cs
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_CS );
-	Files = (gid_File_Extension_Dictionary_Cs);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Cs);
+    InstallOrder = "2000";
     Sortkey = "530";
-	Spellcheckerlanguage = "cs";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "cs";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Da
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DA );
-	Files = (gid_File_Extension_Dictionary_Da);
+    Files = (gid_File_Extension_Dictionary_Da);
     Sortkey = "540";
-	InstallOrder = "2000";
-	Spellcheckerlanguage = "da";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    InstallOrder = "2000";
+    Spellcheckerlanguage = "da";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_De_AT
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_AT );
     Files = (gid_File_Extension_Dictionary_De_AT);
-	InstallOrder = "2000";
+    InstallOrder = "2000";
     Sortkey = "570";
     Spellcheckerlanguage = "de-AT";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_De_CH
@@ -135,57 +146,57 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_En
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_EN );
-	Files = (gid_File_Extension_Dictionary_En);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_En);
+    InstallOrder = "2000";
     Sortkey = "550";
-	Spellcheckerlanguage = "en-US";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "en";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Es
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ES );
-	Files = (gid_File_Extension_Dictionary_Es);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Es);
+    InstallOrder = "2000";
     Sortkey = "720";
-	Spellcheckerlanguage = "es";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "es";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Et
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ET );
-	Files = (gid_File_Extension_Dictionary_Et);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Et);
+    InstallOrder = "2000";
     Sortkey = "555";
-	Spellcheckerlanguage = "et";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "et";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Fr
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_FR );
-	Files = (gid_File_Extension_Dictionary_Fr);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Fr);
+    InstallOrder = "2000";
     Sortkey = "560";
-	Spellcheckerlanguage = "fr";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "fr";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Gl
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_GL );
-	Files = (gid_File_Extension_Dictionary_Gl);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Gl);
+    InstallOrder = "2000";
     Sortkey = "565";
-	Spellcheckerlanguage = "gl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "gl";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_He
@@ -201,68 +212,79 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_Hu
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HU );
-	Files = (gid_File_Extension_Dictionary_Hu);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Hu);
+    InstallOrder = "2000";
     Sortkey = "600";
-	Spellcheckerlanguage = "hu";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "hu";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Hr
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_HR );
+    Files = (gid_File_Extension_Dictionary_Hr);
+    InstallOrder = "2000";
+    Sortkey = "605";
+    Spellcheckerlanguage = "hr";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_It
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_IT );
-	Files = (gid_File_Extension_Dictionary_It);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_It);
+    InstallOrder = "2000";
     Sortkey = "610";
-	Spellcheckerlanguage = "it";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "it";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Ku_Tr
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_KU_TR );
-	Files = (gid_File_Extension_Dictionary_Ku_Tr);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Ku_Tr);
+    InstallOrder = "2000";
     Sortkey = "620";
-	Spellcheckerlanguage = "ku-TR";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "ku-TR";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Lt
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_LT );
-	Files = (gid_File_Extension_Dictionary_Lt);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Lt);
+    InstallOrder = "2000";
     Sortkey = "630";
-	Spellcheckerlanguage = "lt";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "lt";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Ne
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NE );
-	Files = (gid_File_Extension_Dictionary_Ne);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Ne);
+    InstallOrder = "2000";
     Sortkey = "640";
-	Spellcheckerlanguage = "ne";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "ne";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Nl
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_NL );
-	Files = (gid_File_Extension_Dictionary_Nl);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Nl);
+    InstallOrder = "2000";
     Sortkey = "545";
-	Spellcheckerlanguage = "nl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "nl";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_No
@@ -276,26 +298,37 @@ Module gid_Module_Root_Extension_Dictionary_No
     Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Oc
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_OC );
+    Files = (gid_File_Extension_Dictionary_Oc);
+    InstallOrder = "2000";
+    Sortkey = "655";
+    Spellcheckerlanguage = "oc";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Pl
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PL );
-	Files = (gid_File_Extension_Dictionary_Pl);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Pl);
+    InstallOrder = "2000";
     Sortkey = "660";
-	Spellcheckerlanguage = "pl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "pl";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Pt
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PT );
-	Files = (gid_File_Extension_Dictionary_Pt);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Pt);
+    InstallOrder = "2000";
     Sortkey = "515";
-	Spellcheckerlanguage = "pt";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "pt";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Ro
@@ -311,99 +344,110 @@ End
 
 Module gid_Module_Root_Extension_Dictionary_Ru
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_RU );
-	Files = (gid_File_Extension_Dictionary_Ru);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Ru);
+    InstallOrder = "2000";
     Sortkey = "680";
-	Spellcheckerlanguage = "ru";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "ru";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Sk
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SK );
-	Files = (gid_File_Extension_Dictionary_Sk);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Sk);
+    InstallOrder = "2000";
     Sortkey = "700";
-	Spellcheckerlanguage = "sk";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "sk";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Sl
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SL );
-	Files = (gid_File_Extension_Dictionary_Sl);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Sl);
+    InstallOrder = "2000";
     Sortkey = "710";
-	Spellcheckerlanguage = "sl";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "sl";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Sr
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SR );
-	Files = (gid_File_Extension_Dictionary_Sr);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Sr);
+    InstallOrder = "2000";
     Sortkey = "690";
-	Spellcheckerlanguage = "sr";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "sr";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Sv
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SV );
-	Files = (gid_File_Extension_Dictionary_Sv);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Sv);
+    InstallOrder = "2000";
     Sortkey = "740";
-	Spellcheckerlanguage = "sv";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "sv";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Sw
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_SW );
-	Files = (gid_File_Extension_Dictionary_Sw);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Sw);
+    InstallOrder = "2000";
     Sortkey = "730";
-	Spellcheckerlanguage = "sw";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "sw";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Th
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_TH );
-	Files = (gid_File_Extension_Dictionary_Th);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Th);
+    InstallOrder = "2000";
     Sortkey = "750";
-	Spellcheckerlanguage = "th";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "th";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Uk
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_UK );
+    Files = (gid_File_Extension_Dictionary_Uk);
+    InstallOrder = "2000";
+    Sortkey = "755";
+    Spellcheckerlanguage = "uk";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Vi
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_VI );
-	Files = (gid_File_Extension_Dictionary_Vi);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Vi);
+    InstallOrder = "2000";
     Sortkey = "760";
-	Spellcheckerlanguage = "vi";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "vi";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
 
 Module gid_Module_Root_Extension_Dictionary_Zu
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_ZU );
-	Files = (gid_File_Extension_Dictionary_Zu);
-	InstallOrder = "2000";
+    Files = (gid_File_Extension_Dictionary_Zu);
+    InstallOrder = "2000";
     Sortkey = "770";
-	Spellcheckerlanguage = "zu";
-	PackageInfo = "packinfo_office.txt";
-	ParentID = gid_Module_Dictionaries;
-	Styles = ();
+    Spellcheckerlanguage = "zu";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
 End
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index ee818ae4a82e..49219cf76422 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -55,6 +55,12 @@ en-US = "Afrikaans"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_AF]
 en-US = "Afrikaans spell checker"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_BR]
+en-US = "Breton"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_BR]
+en-US = "Breton spell checker"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_CA]
 en-US = "Catalan"
 
@@ -119,7 +125,7 @@ en-US = "French 'Classic and Reform 1990' spelling, thesaurus and hyphenation"
 en-US = "Galician"
 
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_GL]
-en-US = "Galician spellchecker dictionary for OpenOffice.org"
+en-US = "Galician spellchecker dictionary for %PRODUCTNAME"
 
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_HE]
 en-US = "Hebrew"
@@ -133,6 +139,12 @@ en-US = "Hungarian"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_HU]
 en-US = "Hungarian spelling dictionary, hyphenation patterns, and thesaurus"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_HR]
+en-US = "Croatian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_HR]
+en-US = "Croatian spelling dictionary and hyphenation patterns"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_IT]
 en-US = "Italian"
 
@@ -169,6 +181,12 @@ en-US = "Norwegian"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_NO]
 en-US = "Norwegian dictionaries (Nynorsk and Bokmal)"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_OC]
+en-US = "Occitan"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_OC]
+en-US = "Occitan spell check dictionary"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_PL]
 en-US = "Polish"
 
@@ -191,7 +209,7 @@ en-US = "Romanian Dictionaries"
 en-US = "Russian"
 
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_RU]
-en-US = "Russian hyphenation dictionary and thesaurus"
+en-US = "Russian spell check dictionary, hyphenation rules and thesaurus"
 
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_SK]
 en-US = "Slovak"
@@ -229,6 +247,12 @@ en-US = "Thai"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_TH]
 en-US = "Thai spelling dictionary"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_UK]
+en-US = "Ukrainian"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_UK]
+en-US = "Ukrainian spell check dictionary, hyphenation rules and thesaurus"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_VI]
 en-US = "Vietnamese"
 
diff --git a/scp2/source/ooo/ooo_brand.scp b/scp2/source/ooo/ooo_brand.scp
index 6111ab8130f9..dcdf99b1718d 100644
--- a/scp2/source/ooo/ooo_brand.scp
+++ b/scp2/source/ooo/ooo_brand.scp
@@ -33,9 +33,9 @@ Directory gid_Dir_Brand_Root
   #ifdef WNT
     HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
   #else
-    HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
+    HostName = ".";
   #endif
-    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION);
+    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
 End
 #endif
 
@@ -53,7 +53,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
     Order = 8;
     Key = "ErrorReportServer";
   #if defined(BUILD_SPECIAL)
-    Value = "report.services.openoffice.org";
+    Value = "report.libreoffice.org";
   #else
     Value = "";
   #endif
diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp
index 59ef1673d727..6aa7c4eb8c03 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -206,7 +206,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "HelpLink";
-    Value = "http://www.openoffice.org/servlets/HelpTOC";
+    Value = "http://www.libreoffice.org";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Modifypath
@@ -222,7 +222,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "Publisher";
-    Value = "Sun Microsystems, Inc. for the OpenOffice.org-Community";
+    Value = "The The Document Foundation for the LibreOffice Community";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Uninstallstring
@@ -238,7 +238,7 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "URLInfoAbout";
-    Value = "http://www.openoffice.org/";
+    Value = "http://www.libreoffice.org/";
 End
 
 RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Staroffice_Urlupdateinfo
@@ -246,12 +246,12 @@ RegistryItem gid_Regitem_Software_Microsoft_Windows_Currentversion_Uninstall_Sta
     ModuleID = gid_Module_Root;
     Subkey = "Software\Microsoft\Windows\CurrentVersion\Uninstall\%PRODUCTNAME %PRODUCTVERSION";
     Name = "URLUpdateInfo";
-    Value = "http://www.openoffice.org/dev_docs/source/download.html#newsoftware";
+    Value = "http://download.libreoffice.org";
 End
 
 RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\%PRODUCTNAME\%PRODUCTVERSION";
+    Subkey = "Software\LibreOffice\%PRODUCTNAME\%PRODUCTVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "Path";
 	Value = "<progpath>\program\soffice.exe";
@@ -277,7 +277,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "INSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
@@ -322,7 +322,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "OFFICEINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]";
@@ -349,7 +349,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]Basis\\";
@@ -358,7 +358,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "BASISINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]Basis\\";
@@ -385,7 +385,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]URE\\";
@@ -394,7 +394,7 @@ End
 
 RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
 	ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-	Subkey = "Software\OpenOffice.org\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+    Subkey = "Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
 	ModuleID = gid_Module_Root;
 	Name = "UREINSTALLLOCATION";
 	Value = "[INSTALLLOCATION]URE\\";
@@ -517,14 +517,14 @@ End
 
 RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org\UNO\InstallPath";
+    Subkey = "Software\LibreOffice\UNO\InstallPath";
     ModuleID = gid_Module_Root;
     Value  = "<progpath>\program";
 End
 
 RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org\UNO\InstallPath";
+    Subkey = "Software\LibreOffice\UNO\InstallPath";
     ModuleID = gid_Module_Root;
     Name = "%PRODUCTNAME %PRODUCTVERSION";
     Value  = "<progpath>\program";
diff --git a/scp2/source/ooo/registryitem_ooo.ulf b/scp2/source/ooo/registryitem_ooo.ulf
index d37db89c113a..f8dd53c43c32 100644
--- a/scp2/source/ooo/registryitem_ooo.ulf
+++ b/scp2/source/ooo/registryitem_ooo.ulf
@@ -38,4 +38,4 @@ en-US = "%SXWFORMATNAME %SXWFORMATVERSION Configuration File"
 en-US = "StarOffice 5.0 Template"
 
 [STR_REG_VAL_APPCAPABILITY_DESCRIPTION_OOO]
-en-US = "OpenOffice.org"
+en-US = "LibreOffice"
diff --git a/scp2/source/ooo/scpaction_ooo.scp b/scp2/source/ooo/scpaction_ooo.scp
index b95df7d7f3ac..768460ef6065 100644
--- a/scp2/source/ooo/scpaction_ooo.scp
+++ b/scp2/source/ooo/scpaction_ooo.scp
@@ -27,38 +27,6 @@
 
 #include "macros.inc"
 
-ScpAction scp_Copy_License_Html
-  #ifdef UNX
-    README_TXT_ALL_LANG(Copy, LICENSE, html);
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-  #else
-    README_TXT_ALL_LANG(Copy, license, html);
-    README_TXT_ALL_LANG(Name, license, html);
-  #endif
-    Styles = (SCPZIP_REPLACE);
-  #ifndef MACOSX
-    Subdir = "licenses";
-  #else
-    Subdir = "LICENSEs";
-  #endif
-End
-
-ScpAction scp_Copy_License_Txt
-  #ifdef UNX
-    README_ALL_LANG(Copy, LICENSE);
-    README_ALL_LANG(Name, LICENSE);
-  #else
-    README_TXT_ALL_LANG(Copy, license, txt);
-    README_TXT_ALL_LANG(Name, license, txt);
-  #endif
-    Styles = (SCPZIP_REPLACE);
-  #ifndef MACOSX
-    Subdir = "licenses";
-  #else
-    Subdir = "LICENSEs";
-  #endif
-End
-
 #ifdef MACOSX
 ScpAction scp_Copy_Thirdpartylicense_Readme_Html
     Copy = "THIRDPARTYLICENSEREADME.html";
@@ -67,22 +35,6 @@ ScpAction scp_Copy_Thirdpartylicense_Readme_Html
 End
 #endif
 
-ScpAction scp_Copy_Readme_Html
-  #ifdef UNX
-    README_TXT_ALL_LANG(Copy, README, html);
-    README_TXT_ALL_LANG(Name, README, html);
-  #else
-    README_TXT_ALL_LANG(Copy, readme, html);
-    README_TXT_ALL_LANG(Name, readme, html);
-  #endif
-    Styles = (SCPZIP_REPLACE);
-  #ifndef MACOSX
-    Subdir = "readmes";
-  #else
-    Subdir = "READMEs";
-  #endif
-End
-
 ScpAction scp_Copy_Readme_Txt
   #ifdef UNX
     README_ALL_LANG(Copy, README);
@@ -148,21 +100,6 @@ ScpAction scp_Copy_Xpd_Gif_Setup
     Subdir = "installdata/images";
 End
 
-// Setup license file
-ScpAction scp_Copy_Xpd_Html_License
-    README_TXT_ALL_LANG(Copy, LICENSE, html);
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
-ScpAction scp_Copy_Xpd_Html_License_En_Us
-  	Copy = "LICENSE_en-US.html";
-    Name = "LICENSE.html";
-    Styles = (XPD_ONLY);
-    Subdir = "installdata/html";
-End
-
 // Setup help files
 
 ScpAction scp_Copy_Xpd_Help_Html_Acceptlicense
diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp
index 19e0aba77e11..9f400afbbed0 100644
--- a/scp2/source/ooo/shortcut_ooo.scp
+++ b/scp2/source/ooo/shortcut_ooo.scp
@@ -33,54 +33,49 @@
 Shortcut gid_Shortcut_Lib_Icudata
     FileID = gid_File_Lib_Icudata;
     Dir = SCP2_OOO_BIN_DIR;
+#ifndef AIX
     Name = STRING(CONCAT5(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
+#else
+    Name = "libicudata.so";
+#endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
 
 Shortcut gid_Shortcut_Lib_Icui18n
     FileID = gid_File_Lib_Icui18n;
     Dir = SCP2_OOO_BIN_DIR;
+#ifndef AIX
     Name = STRING(CONCAT5(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
+#else
+    Name = "libicui18n.so";
+#endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
 
 Shortcut gid_Shortcut_Lib_Icule
     FileID = gid_File_Lib_Icule;
     Dir = SCP2_OOO_BIN_DIR;
+#ifndef AIX
     Name = STRING(CONCAT5(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
+#else
+    Name = "libicule.so";
+#endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
 
 Shortcut gid_Shortcut_Lib_Icuuc
     FileID = gid_File_Lib_Icuuc;
     Dir = SCP2_OOO_BIN_DIR;
+#ifndef AIX
     Name = STRING(CONCAT5(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR));
+#else
+    Name = "libicuuc.so";
+#endif
     Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE);
 End
 
 #endif
 
-Shortcut gid_Shortcut_Lib_Graphite_0
-    FileID = gid_File_Lib_Graphite;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT2(libgraphite,UNXSUFFIX));
-    Styles = (NETWORK,RELATIVE);
-End
-
-Shortcut gid_Shortcut_Lib_Graphite_1
-    FileID = gid_File_Lib_Graphite;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3));
-    Styles = (NETWORK,RELATIVE);
-End
-
-Shortcut gid_Shortcut_Lib_Graphite_2
-    FileID = gid_File_Lib_Graphite;
-    Dir = gid_Dir_Program;
-    Name = STRING(CONCAT4(libgraphite,UNXSUFFIX,.,3.0));
-    Styles = (NETWORK,RELATIVE);
-End
-
 #endif
 
 #ifdef MACOSX
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 2d6b8858eca1..6d61daff3df0 100755..100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -170,104 +170,83 @@ End
 
 // Public Dynamic Libraries:
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcr80_Ure
-    BIN_FILE_BODY;
-    Styles = (PACKED);
+File gid_File_Dl_Cppu
+    TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
-    Name = "msvcr80.dll";
-#else
-    Name = "msvcr80d.dll";
-#endif
+    Name = SCP2_URE_DL_UNO_VER("cppu", "3");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    // CompID = "36C01AC6-BB0A-4181-A8B8-50B793ADEDB7";
 End
-#endif
-#endif
-#endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcp80_Ure
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Cppu
     BIN_FILE_BODY;
-    Styles = (PACKED);
     Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
-    Name = "msvcp80.dll";
-#else
-    Name = "msvcp80d.dll";
-#endif
+    Name = SCP2_URE_DL_UNO_NORMAL("cppu");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_UNO_VER("cppu", "3");
 End
 #endif
-#endif
-#endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Lib_Msvcm80_Ure
-    BIN_FILE_BODY;
-    Styles = (PACKED);
+File gid_File_Dl_Cppuhelper
+    TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
-    Name = "msvcm80.dll";
-#else
-    Name = "msvcm80d.dll";
-#endif
+    Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    // CompID = "D2A191E6-2023-41F5-9032-B98C50C37964";
 End
-#endif
-#endif
-#endif
 
-#if defined(WNT)
-#if defined(M1400)
-#if defined(PROF_EDITION)
-File gid_File_Msvcm80crt_Manifest_Ure
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Cppuhelper
     BIN_FILE_BODY;
-    Styles = (PACKED);
     Dir = SCP2_URE_DL_DIR;
-#ifndef _STLP_DEBUG
-    Name = "Microsoft.VC80.CRT.manifest";
-#else
-    Name = "Microsoft.VC80.DebugCRT.manifest";
-#endif
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
 End
 #endif
-#endif
-#endif
 
-File gid_File_Dl_Cppu
+File gid_File_Dl_PurpEnvHelper
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_VER("cppu", "3");
+    Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "36C01AC6-BB0A-4181-A8B8-50B793ADEDB7";
+    // CompID = "C80146A8-A14C-44D1-AB9F-D9D8BF22277E";
 End
 
-File gid_File_Dl_Cppuhelper
-    TXT_FILE_BODY;
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_PurpEnvHelper
+    BIN_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "D2A191E6-2023-41F5-9032-B98C50C37964";
+    Target = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
 End
+#endif
 
-File gid_File_Dl_PurpEnvHelper
+File gid_File_Dl_Sal
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
+    Name = SCP2_URE_DL_UNO_VER("sal", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "C80146A8-A14C-44D1-AB9F-D9D8BF22277E";
+    // CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
 End
 
-File gid_File_Dl_Sal
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Sal
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_UNO_NORMAL("sal");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_UNO_VER("sal", "3");
+End
+#endif
+
+File gid_File_Dl_Sal_TextEnc
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_UNO_VER("sal", "3");
+    Name = SCP2_URE_DL_VER("sal_textenc", "3");
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "B1EF3AB6-611E-4027-958A-736583EB82E6";
 End
 
 File gid_File_Dl_Salhelper
@@ -278,6 +257,16 @@ File gid_File_Dl_Salhelper
     // CompID = "879B80E0-F6E1-4931-8EE6-7CF867CB6AA5";
 End
 
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Salhelper
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
+End
+#endif
+
 // Private Dynamic Libraries:
 
 File gid_File_Dl_Profile_Uno
@@ -296,6 +285,18 @@ File gid_File_Dl_Reg
     // CompID = "D5313B1F-D09F-401F-B180-891F70D489ED";
 End
 
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Reg
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_NORMAL("reg");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_VER("reg", "3");
+End
+#endif
+
+
+
 File gid_File_Dl_Store
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -304,6 +305,7 @@ File gid_File_Dl_Store
     // CompID = "A5477BD7-89A3-44AF-8B42-9E28D55C8066";
 End
 
+
 File gid_File_Dl_Xmlreader
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -311,6 +313,18 @@ File gid_File_Dl_Xmlreader
     Styles = (PACKED);
 End
 
+
+
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Store
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_NORMAL("store");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_VER("store", "3");
+End
+#endif
+
 File gid_File_Dl_Jvmaccess
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -319,6 +333,16 @@ File gid_File_Dl_Jvmaccess
     // CompID = "F3D6F794-DA6F-4522-B3A7-C15593C1A577";
 End
 
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Jvmaccess
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_COMID_NORMAL("jvmaccess");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_COMID_VER("jvmaccess", "3");
+End
+#endif
+
 File gid_File_Dl_Jvmfwk
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
@@ -327,6 +351,16 @@ File gid_File_Dl_Jvmfwk
     // CompID = "4E128F82-FA30-4077-88DC-F745C3330093";
 End
 
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Jvmfwk
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_NORMAL("jvmfwk");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_VER("jvmfwk", "3");
+End
+#endif
+
 #if defined SOLAR_JAVA
 File gid_File_Dl_Sunjavaplugin
     TXT_FILE_BODY;
@@ -427,9 +461,7 @@ File gid_File_Dl_Cli_Ure_Assembly
     Version = "${CLI_URE_NEW_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -446,9 +478,7 @@ File gid_File_Dl_Policy_Cli_Ure_Assembly
     Version = "${CLI_URE_POLICY_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -477,9 +507,7 @@ File gid_File_Dl_Cli_Basetypes_Assembly
     Version = "${CLI_BASETYPES_NEW_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -496,9 +524,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly
     Version = "${CLI_BASETYPES_POLICY_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -527,9 +553,7 @@ File gid_File_Dl_Cli_Uretypes_Assembly
     Version = "${CLI_URETYPES_NEW_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -546,9 +570,7 @@ File gid_File_Dl_Policy_Cli_Uretypes_Assembly
     Version = "${CLI_URETYPES_POLICY_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "MSIL";
-#endif
 End
 
 #endif
@@ -577,9 +599,7 @@ File gid_File_Lib_Cli_Cppuhelper_Assembly
     Version = "${CLI_CPPUHELPER_NEW_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "x86";
-#endif
 End
 
 #endif
@@ -596,9 +616,7 @@ File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly
     Version = "${CLI_CPPUHELPER_POLICY_VERSION}";
     Culture = "neutral";
     Attributes = "0";
-#ifndef M1310
     ProcessorArchitecture = "x86";
-#endif
 End
 
 #endif
@@ -814,19 +832,28 @@ File gid_File_Dl_Libxml2
 End
 #endif
 
-#if !defined USE_SYSTEM_STL || \
-    (defined USE_SYSTEM_STL && defined _C52 && defined IS_LP64)
+#ifdef AIX
+Unixlink gid_Unixlink_File_Dl_Libxml2
+    BIN_FILE_BODY;
+    Dir = SCP2_URE_DL_DIR;
+    Name = SCP2_URE_DL_NORMAL("xml2");
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+    Target = SCP2_URE_DL_VER("xml2", "2");
+End
+#endif
+
+#if defined WITH_STLPORT
 File gid_File_Dl_Stlport
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
 #if defined _gcc3 && defined WNT
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("libstlport_gcc_stldebug");
 #else
     Name = SCP2_URE_DL_NORMAL("libstlport_gcc");
 #endif
 #elif defined _gcc3
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("stlport_gcc_stldebug");
 #else
     Name = SCP2_URE_DL_NORMAL("stlport_gcc");
@@ -835,43 +862,49 @@ File gid_File_Dl_Stlport
 #if defined IS_LP64
     Name = SCP2_URE_DL_VER("stlport", "1");
 #else
-#if defined _STLP_DEBUG
+#if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("stlport_sunpro_debug");
 #else
     Name = SCP2_URE_DL_NORMAL("stlport_sunpro");
 #endif
 #endif
-#elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) )
-#if defined _STLP_DEBUG
+#elif defined WNT && ((_MSC_VER == 1500) || (_MSC_VER == 1600))
+#if defined _DEBUG_RUNTIME
     Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45");
 #else
     Name = SCP2_URE_DL_NORMAL("stlport_vc7145");
 #endif
-#else
-#error "stlport dynamic library: unsupported platform"
 #endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "D976338D-D2A5-4D29-B765-D3AC43181C7F";
 End
 #endif
 
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
-	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
+	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
 File gid_File_Dl_GccS
     TXT_FILE_BODY;
     Dir = SCP2_URE_DL_DIR;
+#ifdef AIX
+    Name = "libgcc_s.a";
+#else
     Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3));
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB";
 End
 #endif
 
-#if defined _gcc3 && !(defined FREEBSD || defined NETBSD \
-	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT))
+#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \
+	|| defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY))
 File gid_File_Dl_Stdcpp
     Dir = SCP2_URE_DL_DIR;
     TXT_FILE_BODY;
+#ifdef AIX
+    Name = "libstdc++.a";
+#else
     Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3));
+#endif
     Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
     // CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996";
 End
@@ -913,48 +946,6 @@ End
 
 #endif
 
-#ifdef WNT
-#if defined(M1310)
-File gid_File_Dl_Msvcr71
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("msvcr71d");
-#else
-    Name = SCP2_URE_DL_NORMAL("msvcr71");
-#endif
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "074DE395-C6EB-47F7-A587-6311F89C14B4";
-End
-#endif
-#endif
-
-#if defined(WNT)
-#if defined(M1310)
-File gid_File_Dl_Msvcp71
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-#if defined _STLP_DEBUG
-    Name = SCP2_URE_DL_NORMAL("msvcp71d");
-#else
-    Name = SCP2_URE_DL_NORMAL("msvcp71");
-#endif
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "1AF2708A-AAE2-4F25-ADF5-E61A549A51C2";
-End
-#endif
-#endif
-
-#if defined WNT
-File gid_File_Dl_Unicows
-    TXT_FILE_BODY;
-    Dir = SCP2_URE_DL_DIR;
-    Name = SCP2_URE_DL_NORMAL("unicows");
-    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
-    // CompID = "F05005FA-5B2C-43B1-83EF-988EFFF1D7BD";
-End
-#endif
-
 #if defined WNT
 File gid_File_Dl_Uwinapi
     TXT_FILE_BODY;
@@ -1096,20 +1087,31 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Dl_Cli_Cppuhelper_Assembly,
             gid_File_Dl_Policy_Cli_Cppuhelper_Assembly,
             gid_File_Dl_Policy_Cli_Cppuhelper_Config,
-           	gid_File_Lib_Cli_Cppuhelper_Assembly,
+            gid_File_Lib_Cli_Cppuhelper_Assembly,
             gid_File_Lib_Policy_Cli_Cppuhelper_Assembly,
-	        gid_File_Lib_Policy_Cli_Cppuhelper_Config,
+            gid_File_Lib_Policy_Cli_Cppuhelper_Config,
             gid_File_Dl_Cppu,
+            gid_Unixlink_File_Dl_Cppu,
             gid_File_Dl_Cppuhelper,
+            gid_Unixlink_File_Dl_Cppuhelper,
             gid_File_Dl_PurpEnvHelper,
+            gid_Unixlink_File_Dl_PurpEnvHelper,
             gid_File_Dl_Sal,
+            gid_Unixlink_File_Dl_Sal,
+            gid_File_Dl_Sal_TextEnc,
             gid_File_Dl_Salhelper,
+            gid_Unixlink_File_Dl_Salhelper,
             gid_File_Dl_Profile_Uno,
             gid_File_Dl_Reg,
+            gid_Unixlink_File_Dl_Reg,
+            gid_Unixlink_File_Dl_Rmcxt,
             gid_File_Dl_Store,
+            gid_Unixlink_File_Dl_Store,
             gid_File_Dl_Xmlreader,
             gid_File_Dl_Jvmaccess,
+            gid_Unixlink_File_Dl_Jvmaccess,
             gid_File_Dl_Jvmfwk,
+            gid_Unixlink_File_Dl_Jvmfwk,
             gid_File_Dl_Sunjavaplugin,
             gid_File_Dl_JrepropertiesClass,
             gid_File_Dl_Profile_Jvmfwk3rc,
@@ -1146,8 +1148,6 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Lib_Mingw_GccS_Ure,
             gid_File_Lib_Mingw_Stdcpp_Ure,
             gid_File_Lib_Mingwm10_Ure,
-            gid_File_Dl_Msvcr71,
-            gid_File_Dl_Msvcp71,
             gid_File_Dl_Unicows,
             gid_File_Dl_Uwinapi,
             gid_File_Lib_Msvcr80_Ure,
@@ -1162,7 +1162,18 @@ Module gid_Module_Root_Ure_Hidden
             gid_File_Misc_TypesRdb,
             gid_File_Misc_ServicesRdb,
             gid_File_Misc_JavavendorsXml);
-    Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs);
+    Unixlinks = (gid_Unixlink_Ure_Bin_Urelibs,
+                 gid_Unixlink_File_Dl_Sal,
+                 gid_Unixlink_File_Dl_Salhelper,
+                 gid_Unixlink_File_Dl_Cppu,
+                 gid_Unixlink_File_Dl_Cppuhelper,
+                 gid_Unixlink_File_Dl_PurpEnvHelper,
+                 gid_Unixlink_File_Dl_Reg,
+                 gid_Unixlink_File_Dl_Rmcxt,
+                 gid_Unixlink_File_Dl_Store,
+                 gid_Unixlink_File_Dl_Jvmaccess,
+                 gid_Unixlink_File_Dl_Jvmfwk,
+                 gid_Unixlink_File_Dl_Libxml2);
 End
 
 // Profile version.ini
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
index 397d8fd8f2da..397d8fd8f2da 100755..100644
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ b/scp2/source/ooo/ure_into_ooo.scp
diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp
index 5fad8fadcbba..8579139f95e3 100755..100644
--- a/scp2/source/ooo/ure_standalone.scp
+++ b/scp2/source/ooo/ure_standalone.scp
@@ -42,9 +42,9 @@ End
 Directory gid_Dir_Ooo_Openofficeorg
     ParentID = PREDEFINED_PROGDIR;
   #ifdef WNT
-    HostName = "OpenOffice.org";
+    HostName = "LibreOffice";
   #else
-    HostName = "openoffice.org";
+    HostName = "libreoffice";
   #endif
     Styles = (ISINSTALLLOCATION);
 End
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp b/scp2/source/ooo/windowscustomaction_ooo.scp
index 2c46065db8f3..f35482e4dd39 100755..100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -54,6 +54,15 @@ WindowsCustomAction gid_Customaction_Regallmsdocdll
 	Assignment1 = ("InstallExecuteSequence", "Not REMOVE=\"ALL\" And Not PATCH And _IsSetupTypeMin<>\"Custom\"", "CostFinalize");
 End
 
+WindowsCustomAction gid_Customaction_Restoreregallmsdocdll
+    Name = "Restoreregallmsdocdll";
+    Typ = "65";
+    Source = "reg4allmsdoc.dll";
+    Target = "RestoreRegAllMSDoc";
+    Inbinarytable = 1;
+    Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" And Not PATCH", "end");
+End
+
 WindowsCustomAction gid_Customaction_Regactivexdll1
 	Name = "Regactivexdll1";
 	Typ = "65";
@@ -450,22 +459,13 @@ WindowsCustomAction gid_Customaction_CheckVersions
 	Assignment2 = ("InstallUISequence", "NOT Installed", "NewProductFound");
 End
 
-WindowsCustomAction gid_Customaction_ShowReleaseNotes1
-	Name = "ShowReleaseNotesBefore";
-	Typ = "65";
-	Source = "relnotes.dll";
-	Target = "ShowReleaseNotesBefore";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "behind_InstallValidate");
-End
-
-WindowsCustomAction gid_Customaction_ShowReleaseNotes2
-	Name = "ShowReleaseNotesAfter";
-	Typ = "65";
-	Source = "relnotes.dll";
-	Target = "ShowReleaseNotesAfter";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "end");
+WindowsCustomAction gid_Customaction_SelectLanguage
+    Name = "SelectLanguage";
+    Typ = "321";
+    Source = "sellangmsi.dll";
+    Target = "SelectLanguage";
+    Inbinarytable = 1;
+    Assignment1 = ("ControlEvent", "SetupType", "Next", "DoAction", "SelectLanguage", "1", "1");
 End
 
 WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
@@ -478,15 +478,6 @@ WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
 	Assignment2 = ("AdminExecuteSequence", "VersionNT < 600 And Not REMOVE=\"ALL\"", "end");
 End
 
-WindowsCustomAction gid_Customaction_ShowSurvey
-	Name = "ShowSurveyAfterUninstall";
-	Typ = "65";
-	Source = "relnotes.dll";
-	Target = "ShowSurveyAfter";
-	Inbinarytable = 1;
-	Assignment1 = ("InstallExecuteSequence", "REMOVE=\"ALL\" and Not UPGRADINGPRODUCTCODE", "end");
-End
-
 WindowsCustomAction gid_Customaction_LookForRegisteredExtensions
 	Name = "LookForRegisteredExtensions";
 	Typ = "65";
diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp
index c99a93407e87..2895c5c8b27e 100644
--- a/scp2/source/python/file_python.scp
+++ b/scp2/source/python/file_python.scp
@@ -1,7 +1,7 @@
 /*************************************************************************
  *
  * 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
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifndef DISABLE_PYUNO
+
 File gid_File_Lib_Pyuno
     TXT_FILE_BODY;
   #ifdef UNX
@@ -102,19 +104,10 @@ End
 #endif
 #endif
 
-// Scripting Framework Python script proxy
-
-File gid_File_Py_Pythonscript
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Program;
-    Name = "pythonscript.py";
-    Styles = (PACKED);
-End
- 
 //Scripting Framework Python example scripts
 
 File gid_File_Scripts_Python
-    TXT_FILE_BODY; 
+    TXT_FILE_BODY;
     Styles = (ARCHIVE);
     Dir = gid_Dir_Share_Scripts;
     Name = "ScriptsPython.zip";
@@ -137,6 +130,14 @@ File gid_File_Lib_Python_So
     Name = STRING(PY_FULL_DLL_NAME);
     Styles = (PACKED);
 End
+#ifdef UNX
+Shortcut gid_Shortcut_Lib_Python_So
+    FileID = gid_File_Lib_Python_So;
+    Dir = gid_Dir_Program;
+    Name = STRING(CONCAT3(libpython,PYMAJMIN,UNXSUFFIX));
+    Styles = (NETWORK,RELATIVE);
+End
+#endif //UNX
 #else //MACOSX
 //directory entries solely to be able to create the symlinks
 Directory gid_Dir_PythonFramework
@@ -299,13 +300,19 @@ End
 
 #ifdef UNX
 
-// pyuno.so even on Mac OS X, because it is a python module
 File gid_File_Pyuno
     TXT_FILE_BODY;
+#ifdef MACOSX
+    // note: Mac OS X use .dylib, even for python modules
+    Name = "pyuno.dylib";
+#else
     Name = "pyuno.so";
+#endif
     Dir = gid_Dir_Program;
     Styles = (PACKED);
 End
 
 #endif
 
+// DISABLE_PYUNO
+#endif
diff --git a/scp2/source/python/makefile.mk b/scp2/source/python/makefile.mk
index 4e03218ff06a..f3bff44cb582 100644
--- a/scp2/source/python/makefile.mk
+++ b/scp2/source/python/makefile.mk
@@ -37,11 +37,15 @@ TARGETTYPE=CUI
 
 .INCLUDE :	settings.mk
 
+.IF "$(DISABLE_PYTHON)" == "TRUE"
+SCPDEFS+=-DDISABLE_PYUNO
+.ELSE
 .IF "$(SYSTEM_PYTHON)" == "YES"
 SCPDEFS+=-DSYSTEM_PYTHON
 .ELSE
 .INCLUDE :      pyversion.mk
 .ENDIF
+.ENDIF
 
 SCPDEFS+=\
     -DPYVERSION=$(PYVERSION) -DPYMAJMIN=$(PYMAJOR).$(PYMINOR) \
diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp
index 3abeec2e3142..eef393917432 100644
--- a/scp2/source/python/module_python.scp
+++ b/scp2/source/python/module_python.scp
@@ -27,13 +27,17 @@
 
 #include "macros.inc"
 
+#ifndef DISABLE_PYUNO
+
 Module gid_Module_Optional_Pyuno
     PackageInfo = "packinfo_office.txt";
     MOD_NAME_DESC ( MODULE_OPTIONAL_PYTHON );
     ParentID = gid_Module_Optional;
     Sortkey = "750";
-    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So, gid_File_Lib_Python_So_Brand, gid_File_Py_Scriptprovider,gid_File_Py_Pythonscript,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
+    Files = (gid_File_Pyuno,gid_File_Lib_Pyuno,gid_File_Lib_Pythonloader,gid_File_Py_Unohelper,gid_File_Py_Officehelper,gid_File_Py_Uno,gid_File_Py_Pythonloader,gid_File_Py_Python_Core,gid_File_Py_Python_Bin,gid_File_Lib_Python_So,gid_Shortcut_Lib_Python_So,gid_File_Lib_Python_So_Brand,gid_File_Scripts_Python,gid_File_Share_Registry_Pyuno_Xcd);
     Minimal = NO;
     Default = YES;
     Styles = ( );
 End
+
+#endif
diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp
index 15177971ba1a..53ed507acd08 100644
--- a/scp2/source/python/module_python_mailmerge.scp
+++ b/scp2/source/python/module_python_mailmerge.scp
@@ -27,9 +27,19 @@
 
 #include "macros.inc"
 
+#ifndef AIX
+#ifndef DISABLE_PYUNO
 File gid_File_Pymailmerge
     TXT_FILE_BODY;
     Dir = gid_Dir_Program;
     Name = "mailmerge.py";
     Styles = (PACKED);
 End
+File gid_File_Pymailmerge_msgbox
+    TXT_FILE_BODY;
+    Dir = gid_Dir_Program;
+    Name = "msgbox.py";
+    Styles = (PACKED);
+End
+#endif
+#endif
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp
index 1c4fdb077986..e0ceceead612 100644
--- a/scp2/source/python/profileitem_python.scp
+++ b/scp2/source/python/profileitem_python.scp
@@ -27,6 +27,7 @@
 
 #include "macros.inc"
 
+#ifndef DISABLE_PYUNO
 
 Profile gid_Profile_Pythonloader_Uno_Ini
     ModuleID = gid_Module_Optional_Pyuno;
@@ -92,3 +93,6 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath
   #endif
 #endif
 End
+
+// DISABLE_PYUNO
+#endif
diff --git a/scp2/source/quickstart/registryitem_quickstart.scp b/scp2/source/quickstart/registryitem_quickstart.scp
index 4c8b4c5ad2a5..31e0e951102d 100644
--- a/scp2/source/quickstart/registryitem_quickstart.scp
+++ b/scp2/source/quickstart/registryitem_quickstart.scp
@@ -29,7 +29,7 @@
 
 RegistryItem gid_Regitem_Software_OpenOffice_Quickstarterinstalled
     ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
-    Subkey = "Software\OpenOffice.org";
+    Subkey = "Software\LibreOffice";
     ModuleID = gid_Module_Optional_Quickstart;
     Name = "QuickStarterInstalled";
     Value = "1";
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index c9319f68dfd4..a15e4c399811 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -39,11 +39,6 @@ Installation gid_Installation_Sdk
 #endif
 End
 
-DataCarrier gid_Datacarrier
-    Name = "%PRODUCTNAME %PRODUCTVERSION";
-    DiskNo = 1;
-End
-
 #ifndef MACOSX
 
 #ifdef WNT
@@ -60,7 +55,7 @@ Directory gid_Dir_Ooo_Openofficeorg_Sdk
   #ifdef WNT
     HostName = "${BASISROOTNAME}";
   #else
-    HostName = "${UNIXBASISROOTNAME}";
+    HostName = ".";
   #endif
 End
 #endif
@@ -82,8 +77,7 @@ End
 Directory gid_Dir_Basis_Sdk
 #if defined MACOSX
     ParentID = PREDEFINED_PROGDIR;
-    // DosName = "OpenOffice.org${OOOBASEVERSION}_SDK";
-    DosName = "OpenOffice.org_SDK";
+    DosName = "LibreOffice${OOOBASEVERSION}_SDK";
 #else
   #if defined WNT
     ParentID = gid_Dir_Sdkoo_Root;
@@ -94,24 +88,6 @@ Directory gid_Dir_Basis_Sdk
 #endif
 End
 
-
-#if defined MACOSX
-ScpAction scp_Copy_License_Html_Sdk
-    README_TXT_ALL_LANG(Copy, LICENSE, html);
-    README_TXT_ALL_LANG(Name, LICENSE, html);
-    Styles = (SCPZIP_REPLACE);
-    Subdir = "LICENSEs";
-End
-
-ScpAction scp_Copy_License_Txt_Sdk
-    README_ALL_LANG(Copy, LICENSE);
-    README_ALL_LANG(Name, LICENSE);
-    Styles = (SCPZIP_REPLACE);
-    Subdir = "LICENSEs";
-End
-#endif
-
-
 Directory gid_Dir_Share_Sdk
     ParentID = gid_Dir_Basis_Sdk;
     DosName = "share";
@@ -123,7 +99,7 @@ Directory gid_Dir_Share_Readme_Sdk
 End
 
 
-Module gid_Module_Root
+Module gid_Module_Root_SDK
     Name = "sdkoo";
     Description = "sdkoo";
     PackageInfo = "packinfo_sdkoo.txt";
@@ -134,22 +110,10 @@ File gid_File_Txt_License
     TXT_FILE_BODY;
     Dir = gid_Dir_Share_Readme_Sdk;
   #ifdef UNX
-    Name = "LICENSE_en-US";
+    Name = "LICENSE";
   #endif
   #ifdef WNT
-    Name = "license_en-US.txt";
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_File_Txt_License_Html
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-  #ifdef UNX
-    Name = "LICENSE_en-US.html";
-  #endif
-  #ifdef WNT
-    Name = "license_en-US.html";
+    Name = "license.txt";
   #endif
     Styles = (PACKED, SCPZIP_REPLACE);
 End
@@ -166,19 +130,6 @@ File gid_File_Txt_Readme
     Styles = (PACKED, SCPZIP_REPLACE);
 End
 
-File gid_File_Txt_Readme_Html
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Share_Readme_Sdk;
-  #ifdef UNX
-    Name = "README_en-US.html";
-  #endif
-  #ifdef WNT
-    Name = "readme_en-US.html";
-  #endif
-    Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-
 File gid_File_Zip_Odkexamples
     TXT_FILE_BODY;
     Dir = gid_Dir_Basis_Sdk;
diff --git a/scp2/source/templates/makefile.mk b/scp2/source/templates/makefile.mk
index 47be771c5e50..46b9ac24daa3 100755
--- a/scp2/source/templates/makefile.mk
+++ b/scp2/source/templates/makefile.mk
@@ -40,9 +40,9 @@ TARGET=templates
 COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
 .EXPORT : COMPLETELANGISO_VAR
 
-ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc
+ALLTAR : $(INCCOM)$/alllangmodules.inc $(INCCOM)$/alllangmodules_root.inc $(INCCOM)$/alllangmodules_base.inc $(INCCOM)$/alllangmodules_calc.inc $(INCCOM)$/alllangmodules_draw.inc $(INCCOM)$/alllangmodules_impress.inc $(INCCOM)$/alllangmodules_math.inc $(INCCOM)$/alllangmodules_writer.inc $(INCCOM)$/alllangmodules_binfilter.inc $(INCCOM)$/alllangmodules_accessories_templates_root.inc $(INCCOM)$/alllangmodules_accessories_samples_root.inc $(INCCOM)$/alllangmodules_accessories_templates.inc $(INCCOM)$/alllangmodules_accessories_samples.inc $(INCCOM)$/alllangmodules_extensions_templates.inc $(INCCOM)$/alllangmodules_extensions_lightproof.inc $(INCCOM)$/allhelpmodules.inc $(INCCOM)$/allhelpmodules_root.inc
 
-.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
+.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk $(MISC)$/$(TARGET)_help_track.mk
 .IF "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
 PHONYTEMPL=.PHONY
 .ENDIF			# "$(LAST_COMPLETELANGISO_VAR)"!="$(COMPLETELANGISO_VAR)"
@@ -50,3 +50,7 @@ $(INCCOM)$/alllangmodules%.inc $(PHONYTEMPL) : module_langpack%.sct
     @@-$(RENAME) $@ $@.tmp
     $(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
     @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_lang_track.mk
+$(INCCOM)$/allhelpmodules%.inc $(PHONYTEMPL) : module_helppack%.sct
+    @@-$(RENAME) $@ $@.tmp
+    $(COMMAND_ECHO)$(PERL) -w modules.pl -i $< -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
+    @echo LAST_COMPLETELANGISO_VAR=$(COMPLETELANGISO_VAR) > $(MISC)$/$(TARGET)_help_track.mk
diff --git a/scp2/source/ooo/mergemodules_ooo.scp b/scp2/source/templates/module_helppack.sct
index f88cce4d2314..3b80cd88dec2 100755..100644
--- a/scp2/source/ooo/mergemodules_ooo.scp
+++ b/scp2/source/templates/module_helppack.sct
@@ -25,32 +25,14 @@
  *
 ************************************************************************/
 
-#include "macros.inc"
-
-#ifdef M1500
-MergeModule gid_Mergemodule_Microsoft_Vc90_Crt_X86
-#ifdef _STLP_DEBUG
-	Name = "Microsoft_VC90_DebugCRT_x86.msm";
+Module gid_Module_Helppack_Root_<LANGUAGE_>
+    ParentID = gid_Module_Helppack_Helproot;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_HELPPACK_<LANGUAGEBIG_>);
+#ifdef WITH_HELPPACK_INTEGRATION
+    Styles =(FORCEHELPPACK, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME, LANGUAGEMODULE);
 #else
-	Name = "Microsoft_VC90_CRT_x86.msm";
+    Styles =(HELPPACK, HIDDEN_ROOT, USELANGUAGENAME, LANGUAGEMODULE);
 #endif
-	Cabfilename = "openoffice.org-vc90crt.cab";
-	Feature = "gm_Root";
-	RootDir = "TARGETDIR";
-	Styles = (REMOVE_FILE_TABLE);
 End
-#endif
-
-#ifdef M1500
-MergeModule gid_Mergemodule_Policy_Microsoft_Vc90_Crt_X86
-#ifdef _STLP_DEBUG
-	Name = "policy_9_0_Microsoft_VC90_DebugCRT_x86.msm";
-#else
-	Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm";
-#endif
-	Cabfilename = "openoffice.org-policy-vc90crt.cab";
-	Feature = "gm_Root";
-	RootDir = "TARGETDIR";
-	Styles = (REMOVE_FILE_TABLE);
-End
-#endif
diff --git a/scp2/source/templates/module_helppack_root.sct b/scp2/source/templates/module_helppack_root.sct
new file mode 100644
index 000000000000..2ddf414e3301
--- /dev/null
+++ b/scp2/source/templates/module_helppack_root.sct
@@ -0,0 +1,37 @@
+/*************************************************************************
+*
+ * 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.
+ *
+************************************************************************/
+
+Module gid_Module_Helppack_Help_<LANGUAGE_>
+    ParentID = gid_Module_Helppack_Root_<LANGUAGE_>;
+    Sortkey = "200";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Helppack_Help_Template;
+    Name = "gid_Module_Helppack_Help_<LANGUAGE_>";
+    Description = "gid_Module_Helppack_Help_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_help.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_accessories_samples.sct b/scp2/source/templates/module_langpack_accessories_samples.sct
new file mode 100644
index 000000000000..5a40a3e19295
--- /dev/null
+++ b/scp2/source/templates/module_langpack_accessories_samples.sct
@@ -0,0 +1,64 @@
+/*************************************************************************
+*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: module_langpack_accessories_samples.sct,v $
+ * $Revision: 1.4 $
+ *
+ * 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.
+ *
+************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories_Adv_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Adv_Root_<LANGUAGE_>;
+    Sortkey = "300";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Accessories_Adv_Template;
+    Name = "gid_Module_Optional_Accessories_Adv_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Accessories_Adv_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
+
+Module gid_Module_Optional_Accessories_Doc_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Doc_Root_<LANGUAGE_>;
+    Sortkey = "200";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Accessories_Doc_Template;
+    Name = "gid_Module_Optional_Accessories_Doc_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Accessories_Doc_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
+
+Module gid_Module_Optional_Accessories_Sam_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Sam_Root_<LANGUAGE_>;
+    Sortkey = "100";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Accessories_Sam_Template;
+    Name = "gid_Module_Optional_Accessories_Sam_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Accessories_Sam_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_accessories_samples_root.sct b/scp2/source/templates/module_langpack_accessories_samples_root.sct
new file mode 100644
index 000000000000..dbe08dd0949d
--- /dev/null
+++ b/scp2/source/templates/module_langpack_accessories_samples_root.sct
@@ -0,0 +1,55 @@
+/*************************************************************************
+*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: module_langpack_accessories_root.sct,v $
+ * $Revision: 1.4 $
+ *
+ * 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.
+ *
+************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories_Adv_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Advertisement;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
+
+Module gid_Module_Optional_Accessories_Doc_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Documentations;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
+
+Module gid_Module_Optional_Accessories_Sam_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Samples;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
diff --git a/scp2/source/templates/module_langpack_accessories_templates.sct b/scp2/source/templates/module_langpack_accessories_templates.sct
new file mode 100644
index 000000000000..44b519db3b2a
--- /dev/null
+++ b/scp2/source/templates/module_langpack_accessories_templates.sct
@@ -0,0 +1,42 @@
+/*************************************************************************
+*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: module_langpack_accessories_templates.sct,v $
+ * $Revision: 1.4 $
+ *
+ * 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.
+ *
+************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories_Tem_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Tem_Root_<LANGUAGE_>;
+    Sortkey = "50";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Accessories_Tem_Template;
+    Name = "gid_Module_Optional_Accessories_Tem_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Accessories_Tem_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_accessories_templates_root.sct b/scp2/source/templates/module_langpack_accessories_templates_root.sct
new file mode 100644
index 000000000000..fe0da7247acc
--- /dev/null
+++ b/scp2/source/templates/module_langpack_accessories_templates_root.sct
@@ -0,0 +1,39 @@
+/*************************************************************************
+*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: module_langpack_accessories_root.sct,v $
+ * $Revision: 1.4 $
+ *
+ * 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.
+ *
+************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Accessories_Tem_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Accessories_Templates;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
diff --git a/scp2/source/templates/module_langpack_extensions_lightproof.sct b/scp2/source/templates/module_langpack_extensions_lightproof.sct
new file mode 100644
index 000000000000..1cadbdea8fa4
--- /dev/null
+++ b/scp2/source/templates/module_langpack_extensions_lightproof.sct
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_langpack_extensions_templates.sctp,v $
+ *
+ *  $Revision: 1.0 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2008/11/18 14:50:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Extensions_LightProof;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
+
+Module gid_Module_Optional_Extensions_LightProof_M_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Extensions_LightProof_Root_<LANGUAGE_>;
+    Sortkey = "50";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Extensions_LightProof_Template;
+    Name = "gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Extensions_LightProof_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_extensions_templates.sct b/scp2/source/templates/module_langpack_extensions_templates.sct
new file mode 100644
index 000000000000..f5099abdffc8
--- /dev/null
+++ b/scp2/source/templates/module_langpack_extensions_templates.sct
@@ -0,0 +1,55 @@
+/*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: module_langpack_extensions_templates.sctp,v $
+ *
+ *  $Revision: 1.0 $
+ *
+ *  last change: $Author: KAMI $ $Date: 2008/11/18 14:50:39 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 3.
+ *
+ *
+ *    GNU Lesser General Public License Version 3
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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 for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
+ ************************************************************************/
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Extensions_Sun_T_Pack_Root_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Extensions_Sun_Template_Pack;
+    Sortkey = "<SORTKEY>";
+    Language = "<LANGUAGE>";
+    MOD_NAME_DESC(MODULE_LANGPACK_<LANGUAGEBIG_>);
+    Styles =(LANGUAGEMODULE, SHOW_MULTILINGUAL_ONLY, USELANGUAGENAME);
+End
+
+Module gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>
+    ParentID = gid_Module_Optional_Extensions_Sun_T_Pack_Root_<LANGUAGE_>;
+    Sortkey = "50";
+    Language = "<LANGUAGE>";
+    Assigns = gid_Module_Optional_Extensions_Sun_T_Pack_Template;
+    Name = "gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>";
+    Description = "gid_Module_Optional_Extensions_Sun_T_Pack_<LANGUAGE_>";
+    PackageInfo = "packinfo_office_lang.txt";
+    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
+End
diff --git a/scp2/source/templates/module_langpack_root.sct b/scp2/source/templates/module_langpack_root.sct
index 0eb5a5373f55..2db4529c50aa 100755
--- a/scp2/source/templates/module_langpack_root.sct
+++ b/scp2/source/templates/module_langpack_root.sct
@@ -48,17 +48,6 @@ Module gid_Module_Langpack_Resource_<LANGUAGE_>
     Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
 End
 
-Module gid_Module_Langpack_Help_<LANGUAGE_>
-    ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
-    Sortkey = "200";
-    Language = "<LANGUAGE>";
-    Assigns = gid_Module_Langpack_Help_Template;
-    Name = "gid_Module_Langpack_Help_<LANGUAGE_>";
-    Description = "gid_Module_Langpack_Help_<LANGUAGE_>";
-    PackageInfo = "packinfo_office_lang.txt";
-    Styles =(HIDDEN_ROOT, LANGUAGEMODULE);
-End
-
 Module gid_Module_Langpack_Fonts_<LANGUAGE_>
     ParentID = gid_Module_Langpack_Root_<LANGUAGE_>;
     Sortkey = "300";
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index 50f0aa064d71..a03a55ee944d 100755..100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -87,15 +87,6 @@ End
 
 #endif
 
-#if defined M1310
-File gid_File_Lib_Shlxthdl_Msvcr71
-    TXT_FILE_BODY;
-    Dir = gid_Dir_Shlxthdl;
-    Name = SCP2_URE_DL_NORMAL("msvcr71" SCP2_STDLP_DEBUG);
-    Styles = (PACKED);
-End
-#endif
-
 File gid_File_Lib_Shlxtmsi
     TXT_FILE_BODY;
     Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
diff --git a/scp2/source/winexplorerext/makefile.mk b/scp2/source/winexplorerext/makefile.mk
index 21eaad714eac..435ed439987d 100755
--- a/scp2/source/winexplorerext/makefile.mk
+++ b/scp2/source/winexplorerext/makefile.mk
@@ -50,10 +50,6 @@ PARFILES= \
         registryitem_winexplorerext.par
 .ENDIF
 
-.IF "$(USE_SYSTEM_STL)" == "YES" || "$(STLPORT4)" != "NO_STLPORT4"
-SCPDEFS+=-DUSE_SYSTEM_STL
-.ENDIF
-
 ULFFILES= \
         module_winexplorerext.ulf
 
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index 6993ba25c1d1..f20edccc59ae 100755..100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -38,7 +38,6 @@ Module gid_Module_Optional_Winexplorerext
 			 gid_File_Lib_Shlxthdl64,
 			 gid_File_Lib_OOoFilt,
 			 gid_File_Lib_OOoFilt64,
-             gid_File_Lib_Shlxthdl_Msvcr71,
              gid_File_Lib_Shlxtmsi,
              gid_File_Lib_Reg64,
              gid_File_Tmp_Userinstall_Winexplorerext_Inf);    
diff --git a/scp2/source/writer/file_writer.scp b/scp2/source/writer/file_writer.scp
index e3f6c532fc0c..ea6502445a66 100644
--- a/scp2/source/writer/file_writer.scp
+++ b/scp2/source/writer/file_writer.scp
@@ -27,9 +27,9 @@
 
 #include "macros.inc"
 
-STD_LIB_FILE( gid_File_Lib_Swd , swd)
+STD_LIB_FILE(gid_File_Lib_Swd, swd)
 
-SPECIAL_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
+STD_LIB_FILE(gid_File_Lib_Hwpreader, hwp)
 
 File gid_File_Exe_Swriter
     BIN_FILE_BODY;
@@ -55,7 +55,7 @@ End
 
 File gid_File_Help_Swriter_Zip
     Dir = gid_Dir_Help_Isolanguage;
-    ARCHIVE_TXT_FILE_BODY;
+    ARCHIVE_TXT_FILE_BODY_HELPPACK;
     EXTRA_ALL_GOOD_HELP_LOCALIZATIONS_LANG(swriter);
     Patchfiles = ();
 End
diff --git a/scp2/source/writer/module_writer.scp b/scp2/source/writer/module_writer.scp
index 0d959dd3f86b..e66214bbc71c 100644
--- a/scp2/source/writer/module_writer.scp
+++ b/scp2/source/writer/module_writer.scp
@@ -49,8 +49,10 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Lib_Swui,
     gid_File_Lib_Msword,
     gid_File_Lib_Wpft,
-    gid_File_Lib_Writerfilter,
+    gid_File_Lib_Msworks,
     gid_File_Lib_T602Filter,
+    gid_File_Lib_Writerfilter,
+    gid_File_Lib_Wlwp,
     gid_File_Share_Config_Sofficecfg_Writer_Menubar_Xml,
     gid_File_Share_Config_Sofficecfg_Writerweb_Menubar_Xml,
     gid_File_Share_Config_Sofficecfg_Writerglobal_Menubar_Xml,
@@ -61,15 +63,6 @@ Module gid_Module_Prg_Wrt_Bin
     gid_File_Tmp_Userinstall_Wrt_Inf);
 End
 
-// Module gid_Module_Prg_Wrt_Help
-//    MOD_NAME_DESC ( MODULE_PRG_WRT_HELP );
-//    ParentID = gid_Module_Prg_Wrt;
-//    Sortkey = "200";
-//    Default = YES;
-//    Minimal = YES;
-//    Files = (gid_File_Help_Swriter_Zip);
-// End
-
 Module gid_Module_Brand_Prg_Wrt
     PackageInfo = "packinfo_brand.txt";
     Name = "gid_Module_Brand_Prg_Wrt";
@@ -88,8 +81,7 @@ Module gid_Module_Langpack_Writer_Template
     Name = "gid_Module_Langpack_Writer_Template";
     Description = "gid_Module_Langpack_Writer_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Help_Swriter_Zip,
-             gid_File_Res_T602Filter);
+    Files = (gid_File_Res_T602Filter);
 End
 
 Module gid_Module_Prg_Wrt_MSO_Reg
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 903a48af7d44..6e3d9741430b 100755..100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -27,6 +27,8 @@
 
 #include "macros.inc"
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 // MSOLE embedded object in SO7 file format
 RegistryItem gid_Regitem_Clsid__30a2652a_Ddf7_45e7_Aca6_3eab26fc8a4e_
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -265,6 +267,7 @@ RegistryItem gid_Regitem_Clsid__F616b81f_7bb8_4f22_B8a5_47428d59f8ad__Versionind
     Value = "opendocument.WriterDocument.1";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
 
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
@@ -273,6 +276,8 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6
     REG_VALUE_LNG(SO60_TEXT)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -280,6 +285,8 @@ RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Clsid
     Value = "{30A2652A-DDF7-45e7-ACA6-3EAB26FC8A4E}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -761,6 +768,8 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1
     REG_VALUE_LNG(OO_WRITER)
 End
 
+#ifdef WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Clsid
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -768,6 +777,8 @@ RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Clsid
     Value = "{F616B81F-7BB8-4F22-B8A5-47428D59F8AD}";
 End
 
+#endif // WITH_ACTIVEX_COMPONENT
+
 RegistryItem gid_Regitem_Openoffice_Writerdocument_1_Defaulticon
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
     ModuleID = gid_Module_Prg_Wrt_Bin;
@@ -883,6 +894,53 @@ RegistryItem gid_Regitem_Openoffice_Writerwebdocument_1_Shell_Open_Command
     Styles = ();
 End
 
+// .fodt
+
+RegistryItem gid_Regitem_Fodt_PersistentHandler
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".fodt\PersistentHandler";
+    Value = "{7BC0E713-5703-45BE-A29D-5D46D8B39262}";
+End
+
+RegistryItem gid_Regitem_Fodt_Shellex_00021500_0000_0000_C000_000000000046
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".fodt\shellex\{00021500-0000-0000-C000-000000000046}";
+    Value = "{087B3AE3-E237-4467-B8DB-5A38AB959AC9}";
+End
+
+RegistryItem gid_Regitem_Fodt_Shellex_BB2E617C_0920_11D1_9A0B_00C04FC2D6C1
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".fodt\shellex\{BB2E617C-0920-11D1-9A0B-00C04FC2D6C1}";
+    Value = "{3B092F0C-7696-40E3-A80F-68D74DA84210}";
+End
+
+RegistryItem gid_Regitem__Fodt
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".fodt";
+    Value = "opendocument.WriterDocument.1";
+End
+
+RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabilities_FileAssociations_fodt
+    ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+    Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations";
+    ModuleID = gid_Module_Root;
+    Name = ".fodt";
+    Value = "opendocument.WriterDocument.1";
+    Styles = (PATCH);
+End
+
+RegistryItem gid_Regitem_Fodt_Contenttype
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Subkey = ".fodt";
+    Name = "Content Type";
+    Value = "application/vnd.oasis.opendocument.text";
+End
+
 // new ott file extension 
 
 RegistryItem gid_Regitem_Ott_PersistentHandler
@@ -1341,6 +1399,15 @@ RegistryItem gid_Regitem_OpenOffice_WPD_OpenWith_Writer
     Value = " ";
 End
 
+// .WPS
+RegistryItem gid_Regitem_OpenOffice_WPS_OpenWith_Writer
+    ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+    Subkey = ".wps\OpenWithProgIDs";
+    ModuleID = gid_Module_Prg_Wrt_Bin;
+    Name = "opendocument.WriterDocument.1";
+    Value = " ";
+End
+
 // .HWP
 RegistryItem gid_Regitem_OpenOffice_HWP_OpenWith_Writer
     ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index 848b1c707ff7..788a511950a3 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -82,4 +82,3 @@ File gid_File_Xsl_Export_Xhtml_Table
     Dir = gid_Dir_Share_Xslt_Export_Xhtml;
     Name = "/xslt/export/xhtml/table.xsl";
 End
-