[Libreoffice-commits] .: configure.in scp2/prj scp2/source scp2/util set_soenv.in

Kalman "" Szalai kami911 at kemper.freedesktop.org
Tue Nov 30 04:55:18 PST 2010


 configure.in                                             |   80 +
 scp2/prj/build.lst                                       |    3 
 scp2/source/accessories/file_font_accessories.scp        |  901 +++++++++++++++
 scp2/source/accessories/file_gallery_accessories.scp     |  139 ++
 scp2/source/accessories/file_samples_accessories.scp     |   81 +
 scp2/source/accessories/file_templates_accessories.scp   |  272 ++++
 scp2/source/accessories/makefile.mk                      |   86 +
 scp2/source/accessories/module_accessories.scp           |   40 
 scp2/source/accessories/module_accessories.ulf           |   33 
 scp2/source/accessories/module_font_accessories.scp      |  205 +++
 scp2/source/accessories/module_font_accessories.ulf      |   33 
 scp2/source/accessories/module_gallery_accessories.scp   |   60 
 scp2/source/accessories/module_gallery_accessories.ulf   |   33 
 scp2/source/accessories/module_samples_accessories.scp   |   98 +
 scp2/source/accessories/module_samples_accessories.ulf   |  706 +++++++++++
 scp2/source/accessories/module_templates_accessories.scp |   99 +
 scp2/source/accessories/module_templates_accessories.ulf |  701 +++++++++++
 scp2/source/ooo/directory_ooo.scp                        |  184 +++
 scp2/util/makefile.mk                                    |   46 
 set_soenv.in                                             |    4 
 20 files changed, 3802 insertions(+), 2 deletions(-)

New commits:
commit 66a01721dd473db85f612593668b616f407b4824
Author: Kalman Szalai - KAMI <kami911 at gmail.com>
Date:   Tue Nov 30 13:45:42 2010 +0100

    Adds OxygenOffice extras as configurable optional
    
     Introduces:
     --enable-extra-gallery  - for additional galleries
     --enable-extra-template - for additional templates
     --enable-extra-sample   - for additional samples
     --enable-extra-font     - for additional fonts
     configure options.

diff --git a/configure.in b/configure.in
index 322b068..069b53a 100644
--- a/configure.in
+++ b/configure.in
@@ -478,6 +478,26 @@ AC_ARG_ENABLE(cl-x64,
         [Use the Microsoft C/C++ x64 compiler instead of the default x86 one.]),
 ,)
 
+AC_ARG_ENABLE(extra-gallery,
+    AS_HELP_STRING([--enable-extra-gallery],
+	[Add extra gallery content.]),
+,)
+
+AC_ARG_ENABLE(extra-template,
+    AS_HELP_STRING([--enable-extra-template],
+	[Add extra temaplte content.]),
+,)
+
+AC_ARG_ENABLE(extra-sample,
+    AS_HELP_STRING([--enable-extra-sample],
+	[Add extra sample content.]),
+,)
+
+AC_ARG_ENABLE(extra-font,
+    AS_HELP_STRING([--enable-extra-font],
+	[Add extra font content.]),
+,)
+
 dnl ---------- Deprecated since 2010-11-05 ----------
 
 AC_ARG_ENABLE(mysql-connector,
@@ -7555,6 +7575,66 @@ else
 fi
 AC_SUBST(WITHOUT_AFMS)
 
+dnl ===================================================================
+dnl Test whether to include extra galleries
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra galleries])
+if test "z$enable_extra_gallery" = "z" -o "z$enable_extra_gallery" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_GALLERY=NO
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_GALLERY=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_GALLERY"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_GALLERY"  
+fi
+AC_SUBST(WITH_EXTRA_GALLERY)
+
+dnl ===================================================================
+dnl Test whether to include extra templates
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra templates])
+if test "z$enable_extra_template" = "z" -o "z$enable_extra_template" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_TEMPLATE=NO
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_TEMPLATE=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_TEMPLATE"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_TEMPLATE"
+fi
+AC_SUBST(WITH_EXTRA_TEMPLATE)
+
+dnl ===================================================================
+dnl Test whether to include extra samples
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra samples])
+if test "z$enable_extra_sample" = "z" -o "z$enable_extra_sample" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_SAMPLE=NO
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_SAMPLE=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_SAMPLE"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_SAMPLE"
+fi
+AC_SUBST(WITH_EXTRA_SAMPLE)
+
+dnl ===================================================================
+dnl Test whether to include extra fonts
+dnl ===================================================================
+AC_MSG_CHECKING([whether to include extra fonts])
+if test "z$enable_extra_font" = "z" -o "z$enable_extra_font" = "zno" ; then
+  AC_MSG_RESULT([no])
+  WITH_EXTRA_FONT=NO
+else
+  AC_MSG_RESULT([yes])
+  WITH_EXTRA_FONT=YES
+  BUILD_TYPE="$BUILD_TYPE EXTRA_FONT"
+  SCPDEFS="$SCPDEFS -DWITH_EXTRA_FONT"
+fi
+AC_SUBST(WITH_EXTRA_FONT)
+
 AC_SUBST(SCPDEFS)
 
 if test "$_os" = "WINNT"; then
diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index b142a43..866db71 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -26,4 +26,5 @@ cp    scp2\source\base            nmake    -    all    cp_base cp_langmacros cp_
 cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
 cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
 cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
+cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
diff --git a/scp2/source/accessories/file_font_accessories.scp b/scp2/source/accessories/file_font_accessories.scp
new file mode 100644
index 0000000..919fe16
--- /dev/null
+++ b/scp2/source/accessories/file_font_accessories.scp
@@ -0,0 +1,901 @@
+/*
+ * 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 at 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 at 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.ttf, 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
+
+#ifdef WITH_EXTRA_FONT 
+STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinum, MagyarLinBiolinum.ttf, Magyar Linux Biolinum)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinumB, MagyarLinBiolinumB.ttf, Magyar Linux Biolinum Bold)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertine, MagyarLinLibertine.ttf, Magyar Linux Libertine)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineB, MagyarLinLibertineB.ttf, Magyar Linux Libertine Bold)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineBI, MagyarLinLibertineBI.ttf, Magyar Linux Libertine Bold Italic)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineC, MagyarLinLibertineC_Re.ttf, Magyar Linux Libertine Capital)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineG, MagyarLinLibertineG.ttf, Magyar Linux Libertine Graphite)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGB, MagyarLinLibertineGB.ttf, Magyar Linux Libertine Bold Graphite)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGBI, MagyarLinLibertineGBI.ttf, Magyar Linux Libertine Bold Italic Graphite)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGI, MagyarLinLibertineGI.ttf, Magyar Linux Libertine Italic Graphite)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineI, MagyarLinLibertineI.ttf, Magyar Linux Libertine Italic)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineN, MagyarLinLibertineN.ttf, Magyar Linux N Libertine)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNB, MagyarLinLibertineNB.ttf, Magyar Linux Libertine N Bold)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNBI, MagyarLinLibertineNBI.ttf, Magyar Linux Libertine N Bold Italic)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNI, MagyarLinLibertineNI.ttf, Magyar Linux Libertine N Italic)
+STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNC, MagyarLinLibertineNC_Re.ttf, Magyar Linux Libertine N Capital)
+#endif
+
diff --git a/scp2/source/accessories/file_gallery_accessories.scp b/scp2/source/accessories/file_gallery_accessories.scp
new file mode 100644
index 0000000..3499ddb
--- /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 at 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 at 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 = "kamigallery.zip";
+End
+
+File gid_File_Extra_Gallery_Draws_People_Accessories
+    Dir = gid_Dir_Gallery_Draws_People;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigallerydrawspeople.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Plants_Accessories
+    Dir = gid_Dir_Gallery_Photos_Plants;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosplants.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Celebration_Accessories
+    Dir = gid_Dir_Gallery_Photos_Celebration;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotoscelebration.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Fauna_Accessories
+    Dir = gid_Dir_Gallery_Photos_Fauna;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosfauna.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Flowers_Accessories
+    Dir = gid_Dir_Gallery_Photos_Flowers;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosflowers.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories
+    Dir = gid_Dir_Gallery_Photos_FoodsandDrinks;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosfoodsanddrinks.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Humans_Accessories
+    Dir = gid_Dir_Gallery_Photos_Humans;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotoshumans.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Landscapes_Accessories
+    Dir = gid_Dir_Gallery_Photos_Landscapes;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotoslandscapes.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Buildings_Accessories
+    Dir = gid_Dir_Gallery_Photos_Buildings;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosbuildings.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Objects_Accessories
+    Dir = gid_Dir_Gallery_Photos_Objects;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosobjects.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Cities_Accessories
+    Dir = gid_Dir_Gallery_Photos_Cities;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotoscities.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Space_Accessories
+    Dir = gid_Dir_Gallery_Photos_Space;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosspace.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Statues_Accessories
+    Dir = gid_Dir_Gallery_Photos_Statues;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotosstatues.zip";
+End
+
+File gid_File_Extra_Gallery_Photos_Travel_Accessories
+    Dir = gid_Dir_Gallery_Photos_Travel;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryphotostravel.zip";
+End
+
+File gid_File_Extra_Gallery_Elements_Bullets2_Accessories
+    Dir = gid_Dir_Gallery_Elements_Bullets2;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigalleryelementsbullets2.zip";
+End
+
+File gid_File_Extra_Gallery_NONFREE_Accessories
+    Dir = gid_Dir_Gallery;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "kamigallerynonfree.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 0000000..7b4486f
--- /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 at 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 at 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 0000000..55689d9
--- /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 at 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 at 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 0000000..45c81ca
--- /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 at 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 at 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 0000000..ded4717
--- /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 at 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 at 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 0000000..4c1adde
--- /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 at 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 at 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 0000000..b2e67a7
--- /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 at 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 at 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 0000000..1fc26c1
--- /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 at 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 at 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 0000000..0ea9867
--- /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 at 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 at 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 0000000..31745df
--- /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 at 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 at 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 0000000..672774c
--- /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 at 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 at 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 0000000..42166a6
--- /dev/null
+++ b/scp2/source/accessories/module_samples_accessories.ulf
@@ -0,0 +1,706 @@
+/*
+ * 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 at 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 at 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_NS]
+en-US = "Northern Sotho"
+
+[STR_DESC_MODULE_LANGPACK_NS]
+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_BY]
+en-US = "Belarusian"
+
+[STR_DESC_MODULE_LANGPACK_BE_BY]
+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 0000000..917cf69
--- /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 at 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 at 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 0000000..31411cb
--- /dev/null
+++ b/scp2/source/accessories/module_templates_accessories.ulf
@@ -0,0 +1,701 @@
+/*
+ * 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 at 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 at 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"

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list