ooo-build r11998 - in trunk: . patches/src680



Author: szalaik
Date: Tue Mar 25 14:47:10 2008
New Revision: 11998
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11998&view=rev

Log:
2008-03-25  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/src680/scp2_accessories.diff: Bad diff, corrected
	* patches/src680/scp2_extensions.diff: Bad diff, corrected
	* download.in: OxygeOffice wants Writing Aids



Modified:
   trunk/ChangeLog
   trunk/download.in
   trunk/patches/src680/scp2_accessories.diff
   trunk/patches/src680/scp2_extensions.diff

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Tue Mar 25 14:47:10 2008
@@ -201,8 +201,8 @@
     # Icons
     push @files, ( 'ooo-windows-icons-0.1.tar.bz2' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
     # Prebuilt dictionaries
-    push @files, ( 'writingaids- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
-    push @files, ( 'writingaids-doc- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32/;
+    push @files, ( 'writingaids- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32|OxygenOfficeLinux|OxygenOfficeWindows/;
+    push @files, ( 'writingaids-doc- PREBUILT_WRITINGAIDS_TIMESTAMP@.zip' ) if '@DISTRO@' =~ m/NovellWin32|GoOoWin32|OxygenOfficeLinux|OxygenOfficeWindows/;
 }
 else
 {

Modified: trunk/patches/src680/scp2_accessories.diff
==============================================================================
--- trunk/patches/src680/scp2_accessories.diff	(original)
+++ trunk/patches/src680/scp2_accessories.diff	Tue Mar 25 14:47:10 2008
@@ -1,5 +1,5 @@
-diff -Naur null/file_accessories.scp scp2/source/accessories/file_accessories.scp
---- null/file_accessories.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/file_accessories.scp scp2/source/accessories/file_accessories.scp
+--- scp2/source/accessories/file_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/file_accessories.scp	2008-03-22 10:57:33.000000000 +0100
 @@ -0,0 +1,54 @@
 +/*************************************************************************
@@ -56,8 +56,8 @@
 +    ARCHIVE_TXT_FILE_BODY_PATCH;
 +    Name = "basicsrvooowikipedia.zip";
 +End
-diff -Naur null/file_font_accessories.scp scp2/source/accessories/file_font_accessories.scp
---- null/file_font_accessories.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/file_font_accessories.scp scp2/source/accessories/file_font_accessories.scp
+--- scp2/source/accessories/file_font_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/file_font_accessories.scp	2008-03-23 23:48:46.000000000 +0100
 @@ -0,0 +1,1935 @@
 +/*************************************************************************
@@ -1995,8 +1995,8 @@
 +#endif
 +#endif
 +
-diff -Naur null/file_gallery_accessories.scp scp2/source/accessories/file_gallery_accessories.scp
---- null/file_gallery_accessories.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/file_gallery_accessories.scp scp2/source/accessories/file_gallery_accessories.scp
+--- scp2/source/accessories/file_gallery_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/file_gallery_accessories.scp	2008-03-22 10:57:33.000000000 +0100
 @@ -0,0 +1,146 @@
 +/*************************************************************************
@@ -2145,8 +2145,8 @@
 +End
 +
 +#endif
-diff -Naur null/file_samples_accessories.scp scp2/source/accessories/file_samples_accessories.scp
---- null/file_samples_accessories.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/file_samples_accessories.scp scp2/source/accessories/file_samples_accessories.scp
+--- scp2/source/accessories/file_samples_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/file_samples_accessories.scp	2008-03-22 10:57:33.000000000 +0100
 @@ -0,0 +1,88 @@
 +/*************************************************************************
@@ -2237,8 +2237,8 @@
 +End
 +
 +#endif
-diff -Naur null/file_templates_accessories.scp scp2/source/accessories/file_templates_accessories.scp
---- null/file_templates_accessories.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/file_templates_accessories.scp scp2/source/accessories/file_templates_accessories.scp
+--- scp2/source/accessories/file_templates_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/file_templates_accessories.scp	2008-03-22 10:57:33.000000000 +0100
 @@ -0,0 +1,186 @@
 +/*************************************************************************
@@ -2427,8 +2427,8 @@
 +End
 +
 +#endif
-diff -Naur null/makefile.mk scp2/source/accessories/makefile.mk
---- null/makefile.mk	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/makefile.mk scp2/source/accessories/makefile.mk
+--- scp2/source/accessories/makefile.mk	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/makefile.mk	2008-03-23 15:28:37.000000000 +0100
 @@ -0,0 +1,78 @@
 +#*************************************************************************
@@ -2509,8 +2509,8 @@
 +
 +# --- File ---------------------------------------------------------
 +.INCLUDE :  target.mk
-diff -Naur null/module_accessories.scp scp2/source/accessories/module_accessories.scp
---- null/module_accessories.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_accessories.scp scp2/source/accessories/module_accessories.scp
+--- scp2/source/accessories/module_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_accessories.scp	2008-03-22 10:57:33.000000000 +0100
 @@ -0,0 +1,46 @@
 +/*************************************************************************
@@ -2559,8 +2559,8 @@
 +    Default = YES;
 +    Styles = ( );
 +End
-diff -Naur null/module_accessories.ulf scp2/source/accessories/module_accessories.ulf
---- null/module_accessories.ulf	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_accessories.ulf scp2/source/accessories/module_accessories.ulf
+--- scp2/source/accessories/module_accessories.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_accessories.ulf	2008-03-22 15:19:18.000000000 +0100
 @@ -0,0 +1,40 @@
 +/*************************************************************************
@@ -2603,8 +2603,8 @@
 +
 +[STR_DESC_MODULE_OPTIONAL_ACCESSORIES]
 +en-US = "Useful %PRODUCTNAME accessories including various Galleries, Templates, Sample documents and Fonts."
-diff -Naur null/module_advertisement_accessories_langpack.scp scp2/source/accessories/module_advertisement_accessories_langpack.scp
---- null/module_advertisement_accessories_langpack.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_advertisement_accessories_langpack.scp scp2/source/accessories/module_advertisement_accessories_langpack.scp
+--- scp2/source/accessories/module_advertisement_accessories_langpack.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_advertisement_accessories_langpack.scp	2008-03-23 15:25:32.000000000 +0100
 @@ -0,0 +1,2475 @@
 +/*************************************************************************
@@ -5082,8 +5082,8 @@
 +End
 +#endif
 +
-diff -Naur null/module_advertisement_accessories_langpack.ulf scp2/source/accessories/module_advertisement_accessories_langpack.ulf
---- null/module_advertisement_accessories_langpack.ulf	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_advertisement_accessories_langpack.ulf scp2/source/accessories/module_advertisement_accessories_langpack.ulf
+--- scp2/source/accessories/module_advertisement_accessories_langpack.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_advertisement_accessories_langpack.ulf	2008-03-23 15:25:54.000000000 +0100
 @@ -0,0 +1,670 @@
 +/*************************************************************************
@@ -5756,8 +5756,8 @@
 +
 +[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT_BASE_LANGPACK_UZ]
 +en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
-diff -Naur null/module_documentations_accessories_langpack.scp scp2/source/accessories/module_documentations_accessories_langpack.scp
---- null/module_documentations_accessories_langpack.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_documentations_accessories_langpack.scp scp2/source/accessories/module_documentations_accessories_langpack.scp
+--- scp2/source/accessories/module_documentations_accessories_langpack.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_documentations_accessories_langpack.scp	2008-03-23 15:27:12.000000000 +0100
 @@ -0,0 +1,2475 @@
 +/*************************************************************************
@@ -8235,8 +8235,8 @@
 +End
 +#endif
 +
-diff -Naur null/module_documentations_accessories_langpack.ulf scp2/source/accessories/module_documentations_accessories_langpack.ulf
---- null/module_documentations_accessories_langpack.ulf	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_documentations_accessories_langpack.ulf scp2/source/accessories/module_documentations_accessories_langpack.ulf
+--- scp2/source/accessories/module_documentations_accessories_langpack.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_documentations_accessories_langpack.ulf	2008-03-23 15:26:27.000000000 +0100
 @@ -0,0 +1,670 @@
 +/*************************************************************************
@@ -8909,8 +8909,8 @@
 +
 +[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS_BASE_LANGPACK_UZ]
 +en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
-diff -Naur null/module_font_accessories.scp scp2/source/accessories/module_font_accessories.scp
---- null/module_font_accessories.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_font_accessories.scp scp2/source/accessories/module_font_accessories.scp
+--- scp2/source/accessories/module_font_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_font_accessories.scp	2008-03-23 10:52:28.000000000 +0100
 @@ -0,0 +1,196 @@
 +/*************************************************************************
@@ -9109,8 +9109,8 @@
 +End
 +
 +#endif
-diff -Naur null/module_font_accessories.ulf scp2/source/accessories/module_font_accessories.ulf
---- null/module_font_accessories.ulf	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_font_accessories.ulf scp2/source/accessories/module_font_accessories.ulf
+--- scp2/source/accessories/module_font_accessories.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_font_accessories.ulf	2008-03-22 15:19:39.000000000 +0100
 @@ -0,0 +1,40 @@
 +/*************************************************************************
@@ -9153,8 +9153,8 @@
 +
 +[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_FONTS]
 +en-US = "Additional fonts for %PRODUCTNAME and other applications."
-diff -Naur null/module_gallery_accessories.scp scp2/source/accessories/module_gallery_accessories.scp
---- null/module_gallery_accessories.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_gallery_accessories.scp scp2/source/accessories/module_gallery_accessories.scp
+--- scp2/source/accessories/module_gallery_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_gallery_accessories.scp	2008-03-23 10:53:49.000000000 +0100
 @@ -0,0 +1,67 @@
 +/*************************************************************************
@@ -9224,8 +9224,8 @@
 +End
 +
 +#endif
-diff -Naur null/module_gallery_accessories.ulf scp2/source/accessories/module_gallery_accessories.ulf
---- null/module_gallery_accessories.ulf	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_gallery_accessories.ulf scp2/source/accessories/module_gallery_accessories.ulf
+--- scp2/source/accessories/module_gallery_accessories.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_gallery_accessories.ulf	2008-03-22 15:19:58.000000000 +0100
 @@ -0,0 +1,40 @@
 +/*************************************************************************
@@ -9268,8 +9268,8 @@
 +
 +[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
 +en-US = "The %PRODUCTNAME Gallery contains more than 2900 elements in various themes."
-diff -Naur null/module_samples_accessories_langpack.scp scp2/source/accessories/module_samples_accessories_langpack.scp
---- null/module_samples_accessories_langpack.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_samples_accessories_langpack.scp scp2/source/accessories/module_samples_accessories_langpack.scp
+--- scp2/source/accessories/module_samples_accessories_langpack.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_samples_accessories_langpack.scp	2008-03-23 14:33:16.000000000 +0100
 @@ -0,0 +1,2475 @@
 +/*************************************************************************
@@ -11747,8 +11747,8 @@
 +End
 +#endif
 +
-diff -Naur null/module_samples_accessories_langpack.ulf scp2/source/accessories/module_samples_accessories_langpack.ulf
---- null/module_samples_accessories_langpack.ulf	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_samples_accessories_langpack.ulf scp2/source/accessories/module_samples_accessories_langpack.ulf
+--- scp2/source/accessories/module_samples_accessories_langpack.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_samples_accessories_langpack.ulf	2008-03-22 13:27:53.000000000 +0100
 @@ -0,0 +1,670 @@
 +/*************************************************************************
@@ -12421,8 +12421,8 @@
 +
 +[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_SAMPLES_BASE_LANGPACK_UZ]
 +en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
-diff -Naur null/module_samples_accessories.scp scp2/source/accessories/module_samples_accessories.scp
---- null/module_samples_accessories.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_samples_accessories.scp scp2/source/accessories/module_samples_accessories.scp
+--- scp2/source/accessories/module_samples_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_samples_accessories.scp	2008-03-23 15:19:17.000000000 +0100
 @@ -0,0 +1,77 @@
 +/*************************************************************************
@@ -12502,8 +12502,8 @@
 +End
 +
 +#endif
-diff -Naur null/module_samples_accessories.ulf scp2/source/accessories/module_samples_accessories.ulf
---- null/module_samples_accessories.ulf	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_samples_accessories.ulf scp2/source/accessories/module_samples_accessories.ulf
+--- scp2/source/accessories/module_samples_accessories.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_samples_accessories.ulf	2008-03-22 15:20:30.000000000 +0100
 @@ -0,0 +1,53 @@
 +/*************************************************************************
@@ -12559,8 +12559,8 @@
 +[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT]
 +en-US = "%PRODUCTNAME advertisement materials."
 +
-diff -Naur null/module_templates_accessories_langpack.scp scp2/source/accessories/module_templates_accessories_langpack.scp
---- null/module_templates_accessories_langpack.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_templates_accessories_langpack.scp scp2/source/accessories/module_templates_accessories_langpack.scp
+--- scp2/source/accessories/module_templates_accessories_langpack.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_templates_accessories_langpack.scp	2008-03-23 14:35:32.000000000 +0100
 @@ -0,0 +1,2476 @@
 +/*************************************************************************
@@ -15039,8 +15039,8 @@
 +End
 +#endif
 +
-diff -Naur null/module_templates_accessories_langpack.ulf scp2/source/accessories/module_templates_accessories_langpack.ulf
---- null/module_templates_accessories_langpack.ulf	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_templates_accessories_langpack.ulf scp2/source/accessories/module_templates_accessories_langpack.ulf
+--- scp2/source/accessories/module_templates_accessories_langpack.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_templates_accessories_langpack.ulf	2008-03-22 13:26:49.000000000 +0100
 @@ -0,0 +1,670 @@
 +/*************************************************************************
@@ -15713,8 +15713,8 @@
 +
 +[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES_BASE_LANGPACK_UZ]
 +en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION"
-diff -Naur null/module_templates_accessories.scp scp2/source/accessories/module_templates_accessories.scp
---- null/module_templates_accessories.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_templates_accessories.scp scp2/source/accessories/module_templates_accessories.scp
+--- scp2/source/accessories/module_templates_accessories.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_templates_accessories.scp	2008-03-23 11:10:17.000000000 +0100
 @@ -0,0 +1,69 @@
 +/*************************************************************************
@@ -15786,8 +15786,8 @@
 +End
 +
 +#endif
-diff -Naur null/module_templates_accessories.ulf scp2/source/accessories/module_templates_accessories.ulf
---- null/module_templates_accessories.ulf	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/accessories/module_templates_accessories.ulf scp2/source/accessories/module_templates_accessories.ulf
+--- scp2/source/accessories/module_templates_accessories.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/accessories/module_templates_accessories.ulf	2008-03-22 15:20:50.000000000 +0100
 @@ -0,0 +1,42 @@
 +/*************************************************************************
@@ -15832,3306 +15832,4 @@
 +[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES]
 +en-US = "Create perfect documents within seconds with document templates."
 +
-diff -Naur null/.svn/entries scp2/source/accessories/.svn/entries
---- null/.svn/entries	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/entries	2008-03-25 00:27:23.000000000 +0100
-@@ -0,0 +1,220 @@
-+8
-+
-+dir
-+11990
-+svn+ssh://szalaik svn gnome org/svn/ooo-build/trunk/scratch/scp2/source/accessories
-+svn+ssh://szalaik svn gnome org/svn/ooo-build
-+
-+
-+
-+2008-03-19T10:12:48.549287Z
-+11941
-+szalaik
-+
-+
-+svn:special svn:externals svn:needs-lock
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+4072966c-c725-0410-ba1b-a990d1e8cb90
-+
-+module_samples_accessories.scp
-+file
-+
-+
-+
-+
-+2008-03-10T20:05:17.000000Z
-+73593e73db4fafc1345a7ef27318a2f7
-+2007-12-24T08:34:16.192977Z
-+11152
-+szalaik
-+
-+module_samples_accessories.ulf
-+file
-+
-+
-+
-+
-+2008-03-21T14:57:30.000000Z
-+2f564bd493c26f732d1090ee595d9e3e
-+2008-03-19T10:12:48.549287Z
-+11941
-+szalaik
-+
-+module_font_accessories.scp
-+file
-+
-+
-+
-+
-+2008-03-10T20:05:17.000000Z
-+9bedad91de16ae4075e0904f7cd8a865
-+2007-12-24T08:34:16.192977Z
-+11152
-+szalaik
-+
-+module_font_accessories.ulf
-+file
-+
-+
-+
-+
-+2008-03-21T14:57:30.000000Z
-+f4709fbcff4dd01d3a77e217099473e7
-+2008-03-19T10:12:48.549287Z
-+11941
-+szalaik
-+
-+makefile.mk
-+file
-+
-+
-+
-+
-+2008-03-10T20:05:17.000000Z
-+887c64ad07fb050fa8f0406789528a6a
-+2007-12-22T22:22:06.742640Z
-+11146
-+szalaik
-+
-+file_accessories.scp
-+file
-+
-+
-+
-+
-+2008-03-10T20:05:17.000000Z
-+5a38cbb0d42655b5d21690e1e2363c2c
-+2007-12-24T12:53:17.501172Z
-+11154
-+szalaik
-+
-+module_accessories.scp
-+file
-+
-+
-+
-+
-+2008-03-10T20:05:17.000000Z
-+b1757c96b175a4b45e1aa40ed6f24fa2
-+2007-12-24T12:53:17.501172Z
-+11154
-+szalaik
-+
-+module_accessories.ulf
-+file
-+
-+
-+
-+
-+2008-03-21T14:57:30.000000Z
-+dececd544dc3e270b5445710f746f2b6
-+2008-03-19T10:12:48.549287Z
-+11941
-+szalaik
-+
-+file_templates_accessories.scp
-+file
-+
-+
-+
-+
-+2008-03-10T20:05:17.000000Z
-+b6b281d86c7e5a7ba2880a33b49685a7
-+2007-12-24T08:34:16.192977Z
-+11152
-+szalaik
-+
-+file_gallery_accessories.scp
-+file
-+
-+
-+
-+
-+2008-03-10T20:05:17.000000Z
-+ad84ae4dacbbfc905ec78797b289e1ca
-+2007-12-24T08:34:16.192977Z
-+11152
-+szalaik
-+
-+module_templates_accessories.scp
-+file
-+
-+
-+
-+
-+2008-03-10T20:05:17.000000Z
-+3505dcf4e884d274e0dd54f8317e5707
-+2007-12-24T08:34:16.192977Z
-+11152
-+szalaik
-+
-+file_samples_accessories.scp
-+file
-+
-+
-+
-+
-+2008-03-10T20:05:17.000000Z
-+5619f20948883bbe8cdfc05e3b93ed14
-+2007-12-24T08:34:16.192977Z
-+11152
-+szalaik
-+
-+module_templates_accessories.ulf
-+file
-+
-+
-+
-+
-+2008-03-21T14:57:30.000000Z
-+13effe2befcde24ff4ac877b2c5c3a92
-+2008-03-19T10:12:48.549287Z
-+11941
-+szalaik
-+
-+module_gallery_accessories.scp
-+file
-+
-+
-+
-+
-+2008-03-10T20:05:17.000000Z
-+8da63829e84e26d80b712a82331ff1c2
-+2007-12-24T08:34:16.192977Z
-+11152
-+szalaik
-+
-+module_gallery_accessories.ulf
-+file
-+
-+
-+
-+
-+2008-03-21T14:57:30.000000Z
-+f4d8141841b34f0f8f18cbbc8661a035
-+2008-03-19T10:12:48.549287Z
-+11941
-+szalaik
-+
-+file_font_accessories.scp
-+file
-+
-+
-+
-+
-+2008-03-10T20:05:17.000000Z
-+46b7f620621cd13b688c88bde3fbc6fd
-+2007-12-24T08:34:16.192977Z
-+11152
-+szalaik
-+
-diff -Naur null/.svn/format scp2/source/accessories/.svn/format
---- null/.svn/format	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/format	2008-03-10 21:05:17.000000000 +0100
-@@ -0,0 +1 @@
-+8
-diff -Naur null/.svn/text-base/file_accessories.scp.svn-base scp2/source/accessories/.svn/text-base/file_accessories.scp.svn-base
---- null/.svn/text-base/file_accessories.scp.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/file_accessories.scp.svn-base	2008-03-10 21:05:17.000000000 +0100
-@@ -0,0 +1,58 @@
-+/*************************************************************************
-+*
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: file_accessories.scp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/07/02 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+/* *** KAMI Extras *** */
-+
-+/* ** Macro - Premium ** */
-+
-+#ifndef WITHOUT_EXTRA_ACCESSORY
-+
-+File gid_File_Basic_Premium
-+    Dir = gid_Dir_Basic_Premium;
-+    ARCHIVE_TXT_FILE_BODY_PATCH;
-+    Name = "basicsrvpremium.zip";
-+End
-+
-+/* ** Macro - OOoWikipedia ** */
-+
-+File gid_File_Basic_OOoWikipedia
-+    Dir = gid_Dir_Basic_OOoWikipedia;
-+    ARCHIVE_TXT_FILE_BODY_PATCH;
-+    Name = "basicsrvooowikipedia.zip";
-+End
-+
-+#endif 
-diff -Naur null/.svn/text-base/file_font_accessories.scp.svn-base scp2/source/accessories/.svn/text-base/file_font_accessories.scp.svn-base
---- null/.svn/text-base/file_font_accessories.scp.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/file_font_accessories.scp.svn-base	2008-03-10 21:05:17.000000000 +0100
-@@ -0,0 +1,1790 @@
-+/*************************************************************************
-+*
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: file_font_accessories.scp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+/* Airmole font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_airmole, airmole.ttf, Airmole ) 
-+#endif 
-+#endif 
-+
-+/* Airmole Antique font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_airmolea, airmolea.ttf, Airmole Antique ) 
-+#endif 
-+#endif 
-+
-+/* Airmole Shaded font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_airmoles, airmoles.ttf, Airmole Shaded ) 
-+#endif 
-+#endif 
-+
-+/* Airmole Stripe font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_airmoleq, airmoleq.ttf, Airmole Stripe ) 
-+#endif 
-+#endif 
-+
-+/* Astron Boy font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_astronbo, astronbo.ttf, Astron Boy ) 
-+#endif 
-+#endif 
-+
-+/* Astron Boy Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_astronbi, astronbi.ttf, Astron Boy Italic ) 
-+#endif 
-+#endif 
-+
-+/* Astron Boy Video font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_astronbv, astronbv.ttf, Astron Boy Video ) 
-+#endif 
-+#endif 
-+
-+/* Astron Boy Wonder font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_astronbw, astronbw.ttf, Astron Boy Wonder ) 
-+#endif 
-+#endif 
-+
-+/* Baveuse font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_baveuse, baveuse.ttf, Baveuse ) 
-+#endif 
-+#endif 
-+
-+/* Berylium font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium ) 
-+#endif 
-+#endif 
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Berylium, Berylium.ttf, Berylium ) 
-+#endif 
-+#endif 
-+
-+/* Berylium Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold )
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Beryliub, Beryliub.ttf, Berylium Bold ) 
-+#endif 
-+#endif 
-+
-+/* Berylium Bold Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Berylibi, Berylibi.ttf, Berylium Bold Italic ) 
-+#endif 
-+#endif 
-+
-+/* Berylium Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Beryliui, Beryliui.ttf, Berylium Italic ) 
-+#endif 
-+#endif 
-+
-+/* Betsy Flanagan 2 font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_BETSY2, BETSY2.ttf, Betsy Flanagan 2 ) 
-+#endif 
-+#endif 
-+
-+/* Blue Highway font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_bluehigh, bluehigh.ttf, Blue Highway ) 
-+#endif 
-+#endif 
-+
-+/* Blue Highway Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_bluebold, bluebold.ttf, Blue Highway Bold ) 
-+#endif 
-+#endif 
-+
-+/* Blue Highway Condensed font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_bluecond, bluecond.ttf, Blue Highway Condensed ) 
-+#endif 
-+#endif 
-+
-+/* Blue Highway Linocut font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_bluehigl, bluehigl.ttf, Blue Highway Linocut ) 
-+#endif 
-+#endif 
-+
-+/* Bullpen font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_bullpen_, bullpen_.ttf, Bullpen ) 
-+#endif 
-+#endif 
-+
-+/* Bullpen 3D font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_bullpen3, bullpen3.ttf, Bullpen 3D ) 
-+#endif 
-+#endif 
-+
-+/* Bullpen Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_bullpeni, bullpeni.ttf, Bullpen Italic ) 
-+#endif 
-+#endif 
-+
-+/* Colourbars font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_colourba, colourba.ttf, Colourbars ) 
-+#endif 
-+#endif 
-+
-+/* Colourbars Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_colourbb, colourbb.ttf, Colourbars Bold ) 
-+#endif 
-+#endif 
-+
-+/* Counterscraps font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_counters, counters.ttf, Counterscraps ) 
-+#endif 
-+#endif 
-+
-+/* Credit Valley font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_creditva, creditva.ttf, Credit Valley ) 
-+#endif 
-+#endif 
-+
-+/* Credit Valley Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_creditvb, creditvb.ttf, Credit Valley Bold ) 
-+#endif 
-+#endif 
-+
-+/* Credit Valley Bold Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_creditvz, creditvz.ttf, Credit Valley Bold Italic ) 
-+#endif 
-+#endif 
-+
-+/* Credit Valley Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_creditvi, creditvi.ttf, Credit Valley Italic ) 
-+#endif
-+#endif 
-+
-+/* Edmunds font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_edmunds, edmunds.ttf, Edmunds ) 
-+#endif 
-+#endif 
-+
-+/* Edmunds Distressed font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_edmundis, edmundis.ttf, Edmunds Distressed ) 
-+#endif 
-+#endif 
-+
-+/* Engebrechtre font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_engeregu, engeregu.ttf, Engebrechtre ) 
-+#endif 
-+#endif 
-+
-+/* Engebrechtre Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_engebold, engebold.ttf, Engebrechtre Bold ) 
-+#endif 
-+#endif 
-+
-+/* Engebrechtre Bold Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_engeboit, engeboit.ttf, Engebrechtre Bold Italic ) 
-+#endif 
-+#endif 
-+
-+/* Engebrechtre Expanded font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_engeexpa, engeexpa.ttf, Engebrechtre Expanded ) 
-+#endif 
-+#endif 
-+
-+/* Engebrechtre Expanded Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_engeexbo, engeexbo.ttf, Engebrechtre Expanded Bold ) 
-+#endif 
-+#endif 
-+
-+/* Engebrechtre Expanded Bold Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_engeexbi, engeexbi.ttf, Engebrechtre Expanded Bold Italic ) 
-+#endif 
-+#endif 
-+
-+/* Engebrechtre Expanded Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_engeexit, engeexit.ttf, Engebrechtre Expanded Italic ) 
-+#endif 
-+#endif 
-+
-+/* Engebrechtre Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_engeital, engeital.ttf, Engebrechtre Italic ) 
-+#endif 
-+#endif 
-+
-+/* Goodfish font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_goodfish, goodfish.ttf, Goodfish ) 
-+#endif 
-+#endif 
-+
-+/* Goodfish Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_goodfisb, goodfisb.ttf, Goodfish Bold ) 
-+#endif 
-+#endif 
-+
-+/* Goodfish Bold Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_goodfisc, goodfisc.ttf, Goodfish Bold Italic ) 
-+#endif 
-+#endif 
-+
-+/* Goodfish Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_goodfisi, goodfisi.ttf, Goodfish Italic ) 
-+#endif 
-+#endif 
-+
-+/* Guanine font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_guanine_, guanine_.ttf, Guanine ) 
-+#endif 
-+#endif 
-+
-+/* Gunplay font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_gunplay, gunplay.ttf, Gunplay ) 
-+#endif 
-+#endif 
-+
-+/* Kirsty font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_kirsty__, kirsty__.ttf, Kirsty ) 
-+#endif 
-+#endif 
-+
-+/* Kirsty Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_kirsty_b, kirsty_b.ttf, Kirsty Bold ) 
-+#endif 
-+#endif 
-+
-+/* Kirsty Bold Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_kirstybi, kirstybi.ttf, Kirsty Bold Italic ) 
-+#endif 
-+#endif 
-+
-+/* Kirsty Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_kirsty_i, kirsty_i.ttf, Kirsty Italic ) 
-+#endif 
-+#endif 
-+
-+/* Kirsty Ink font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_kirstyin, kirstyin.ttf, Kirsty Ink ) 
-+#endif 
-+#endif 
-+
-+/* Mufferaw font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_mufferaw, mufferaw.ttf, Mufferaw ) 
-+#endif 
-+#endif 
-+
-+/* Nasalization font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_nasaliza, nasaliza.ttf, Nasalization ) 
-+#endif 
-+#endif 
-+
-+/* Neuropol font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_NEUROPOL, NEUROPOL.ttf, Neuropol ) 
-+#endif 
-+#endif 
-+
-+/* Numberpile font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_numberpi, numberpi.ttf, Numberpile ) 
-+#endif 
-+#endif 
-+
-+/* Pricedown font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_pricedow, pricedow.ttf, Pricedown ) 
-+#endif 
-+#endif 
-+
-+/* Pupcat font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_pupcat__, pupcat__.ttf, Pupcat ) 
-+#endif 
-+#endif 
-+
-+/* Rina font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_rina, rina.ttf, Rina ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_rina, rina.ttf, Rina ) 
-+#endif 
-+#endif 
-+
-+/* Sandoval font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_sandoval, sandoval.ttf, Sandoval )
-+#endif 
-+#endif 
-+
-+/* Sappy Mugs font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_SAPPM___, SAPPM___.ttf, Sappy Mugs ) 
-+#endif 
-+#endif 
-+
-+/* Screengem font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_screenge, screenge.ttf, Screengem ) 
-+#endif 
-+#endif 
-+
-+/* Steelfish font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_steelfis, steelfis.ttf, Steelfish ) 
-+#endif 
-+#endif 
-+
-+/* Steelfish Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_steelfib, steelfib.ttf, Steelfish Bold ) 
-+#endif 
-+#endif 
-+
-+/* Steelfish Outline font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_steelout, steelout.ttf, Steelfish Outline ) 
-+#endif 
-+#endif 
-+
-+/* Strenuous font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_strenuou, strenuou.ttf, Strenuous ) 
-+#endif 
-+#endif 
-+
-+/* Strenuous 3D font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_strenu3d, strenu3d.ttf, Strenuous 3D ) 
-+#endif 
-+#endif 
-+
-+/* Subpear font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_subpear_, subpear_.ttf, Subpear ) 
-+#endif 
-+#endif 
-+
-+/* Teen font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_teen____, teen____.ttf, Teen ) 
-+#endif 
-+#endif 
-+
-+/* Teen Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_teenbold, teenbold.ttf, Teen Bold ) 
-+#endif 
-+#endif 
-+
-+/* Teen Bold Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_teenbdit, teenbdit.ttf, Teen Bold Italic ) 
-+#endif 
-+#endif 
-+
-+/* Teen Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_teenital, teenital.ttf, Teen Italic ) 
-+#endif 
-+#endif 
-+
-+/* Teen Light font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_teenlite, teenlite.ttf, Teen Light ) 
-+#endif 
-+#endif 
-+
-+/* Teen Light Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_teenlita, teenlita.ttf, Teen Light Italic ) 
-+#endif 
-+#endif 
-+
-+/* Typodermic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_typoderm, typoderm.ttf, Typodermic ) 
-+#endif 
-+#endif 
-+
-+/* Vahika font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_vahika_, vahika_.ttf, Vahika ) 
-+#endif 
-+#endif 
-+
-+/* Vahika Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_vahikab, vahikab.ttf, Vahika Bold ) 
-+#endif 
-+#endif 
-+
-+/* Vahika Bold Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_vahikac, vahikac.ttf, Vahika Bold Italic ) 
-+#endif 
-+#endif 
-+
-+/* Vahika Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_vahikai, vahikai.ttf, Vahika Italic ) 
-+#endif 
-+#endif 
-+
-+/* Vectroid font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_vectroid, vectroid.ttf, Vectroid ) 
-+#endif 
-+#endif 
-+
-+/* Velvenda Cooler font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_velvendc, velvendc.ttf, Velvenda Cooler ) 
-+#endif 
-+#endif 
-+
-+/* Velvenda Megablack font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_velvenda, velvenda.ttf, Velvenda Megablack ) 
-+#endif 
-+#endif 
-+
-+/* Vibrocentric font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_vibrocen, vibrocen.ttf, Vibrocentric ) 
-+#endif 
-+#endif 
-+
-+/* Vibrocentric Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_vibroceb, vibroceb.ttf, Vibrocentric Bold ) 
-+#endif 
-+#endif 
-+
-+/* Vibrocentric Bold Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_vibrocex, vibrocex.ttf, Vibrocentric Bold Italic ) 
-+#endif 
-+#endif 
-+
-+/* Vibrocentric Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_vibrocei, vibrocei.ttf, Vibrocentric Italic ) 
-+#endif 
-+#endif 
-+
-+/* Wintermute font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_wintermu, wintermu.ttf, Wintermute ) 
-+#endif 
-+#endif 
-+
-+/* You're Gone font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_youregon, youregon.ttf, You are Gone )
-+#endif 
-+#endif 
-+
-+/* You're Gone Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic )
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_youregoi, youregoi.ttf, You are Gone Italic ) 
-+#endif 
-+#endif 
-+
-+/* Zekton font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_zekton__, zekton__.ttf, Zekton ) 
-+#endif 
-+#endif 
-+
-+/* Zekton Bold font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_zektonbo, zektonbo.ttf, Zekton Bold ) 
-+#endif 
-+#endif 
-+
-+/* Zekton Bold Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_zektonbi, zektonbi.ttf, Zekton Bold Italic )
-+#endif 
-+#endif 
-+
-+/* Zekton Italic font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic )
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_zektonit, zektonit.ttf, Zekton Italic ) 
-+#endif 
-+#endif 
-+
-+/* Zorque font */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_zorque, zorque.ttf, Zorque )
-+#endif 
-+#endif
-+
-+/* Additional fonts for 2.0.3 */
-+
-+/* -URW-Gothic L */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Gothic_L_Avantgarde, a010013l.ttf, -URW-Gothic L ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Gothic_L_Avantgarde, a010013l.ttf, -URW-Gothic L ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Gothic L Bold */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde, a010015l.ttf, -URW-Gothic L Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Avantgarde, a010015l.ttf, -URW-Gothic L Bold ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Gothic L Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde, a010033l.ttf, -URW-Gothic L Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Gothic_L_Italic_Avantgarde, a010033l.ttf, -URW-Gothic L Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Gothic L Bold Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, -URW-Gothic L Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Gothic_L_Bold_Italic_Avantgarde, a010035l.ttf, -URW-Gothic L Bold Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Bookman L */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Bookman_L_Bookman, b018012l.ttf, -URW-Bookman L ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Bookman_L_Bookman, b018012l.ttf, -URW-Bookman L ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Bookman L Bold */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Bookman, b018015l.ttf, -URW-Bookman L Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Bookman, b018015l.ttf, -URW-Bookman L Bold ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Bookman L Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Bookman_L_Italic_Bookman, b018032l.ttf, -URW-Bookman L Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Bookman_L_Italic_Bookman, b018032l.ttf, -URW-Bookman L Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Bookman L Bold Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman, b018035l.ttf, -URW-Bookman L Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Bookman_L_Bold_Italic_Bookman, b018035l.ttf, -URW-Bookman L Bold Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Century Schoolbook L */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, -URW-Century Schoolbook L ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_New_Century_SchoolBook, c059013l.ttf, -URW-Century Schoolbook L ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Century Schoolbook L Bold */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, -URW-Century Schoolbook L Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_New_Century_SchoolBook, c059016l.ttf, -URW-Century Schoolbook L Bold ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Century Schoolbook L Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, -URW-Century Schoolbook L Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Italic_New_Century_SchoolBook, c059033l.ttf, -URW-Century Schoolbook L Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Century Schoolbook L Bold Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, -URW-Century Schoolbook L Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Century_Schoolbook_L_Bold_Italic_New_Century_SchoolBook, c059036l.ttf, -URW-Century Schoolbook L Bold Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Sans L */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica, n019003l.ttf, -URW-Nimbus Sans L ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica, n019003l.ttf, -URW-Nimbus Sans L ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Sans L Bold */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, -URW-Nimbus Sans L Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica, n019004l.ttf, -URW-Nimbus Sans L Bold ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Sans L Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, -URW-Nimbus Sans L Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica, n019023l.ttf, -URW-Nimbus Sans L Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Sans L Bold Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, -URW-Nimbus Sans L Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica, n019024l.ttf, -URW-Nimbus Sans L Bold Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Sans L Condensed */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, -URW-Nimbus Sans L Condensed ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Helvetica_Condensed, n019043l.ttf, -URW-Nimbus Sans L Condensed ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Sans L Bold Condensed */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, -URW-Nimbus Sans L Bold Condensed ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Helvetica_Condensed, n019044l.ttf, -URW-Nimbus Sans L Bold Condensed ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Sans L Italic Condensed */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, -URW-Nimbus Sans L Italic Condensed ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Italic_Helvetica_Condensed, n019063l.ttf, -URW-Nimbus Sans L Italic Condensed ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Sans L Bold Italic Condensed */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, -URW-Nimbus Sans L Bold Italic Condensed ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Sans_L_Bold_Italic_Helvetica_Condensed, n019064l.ttf, -URW-Nimbus Sans L Bold Italic Condensed ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Roman No9 L */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times, n021003l.ttf, -URW-Nimbus Roman No9 L ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Times, n021003l.ttf, -URW-Nimbus Roman No9 L ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Roman No9 L Bold */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, -URW-Nimbus Roman No9 L Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Times, n021004l.ttf, -URW-Nimbus Roman No9 L Bold ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Roman No9 L Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, -URW-Nimbus Roman No9 L Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Italic_Times, n021023l.ttf, -URW-Nimbus Roman No9 L Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Roman No9 L Bold Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, -URW-Nimbus Roman No9 L Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Roman_No9_L_Bold_Italic_Times, n021024l.ttf, -URW-Nimbus Roman No9 L Bold Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Mono L */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Courier, n022003l.ttf, -URW-Nimbus Mono L ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Courier, n022003l.ttf, -URW-Nimbus Mono L ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Mono L Bold */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier, n022004l.ttf, -URW-Nimbus Mono L Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Courier, n022004l.ttf, -URW-Nimbus Mono L Bold ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Mono LK Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, -URW-Nimbus Mono LK Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Mono_LK_Italic_Courier, n022023l.ttf, -URW-Nimbus Mono LK Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Nimbus Mono L Bold Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, -URW-Nimbus Mono L Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Nimbus_Mono_L_Bold_Italic_Courier, n022024l.ttf, -URW-Nimbus Mono L Bold Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Palladio L */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Palladio_L_Palitino, p052003l.ttf, -URW-Palladio L ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Palladio_L_Palitino, p052003l.ttf, -URW-Palladio L ) 
-+#endif
-+#endif 
-+ 
-+/* -URW-Palladio L Bold */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Palitino, p052004l.ttf, -URW-Palladio L Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Palitino, p052004l.ttf, -URW-Palladio L Bold ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Palladio L Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Palladio_L_Italic_Palitino, p052023l.ttf, -URW-Palladio L Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Palladio_L_Italic_Palitino, p052023l.ttf, -URW-Palladio L Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Palladio L Bold Italic */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino, p052024l.ttf, -URW-Palladio L Bold Italic ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Palladio_L_Bold_Italic_Palitino, p052024l.ttf, -URW-Palladio L Bold Italic ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Standard Symbols L */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Standard_Symbols_L_Symbol, s050000l.ttf, -URW-Standard Symbols L ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Standard_Symbols_L_Symbol, s050000l.ttf, -URW-Standard Symbols L ) 
-+#endif 
-+#endif 
-+ 
-+/* -URW-Chancery L */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery, z003034l.ttf, -URW-Chancery L ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_-URW-Chancery_L_Zapf_Chancery, z003034l.ttf, -URW-Chancery L ) 
-+#endif 
-+#endif 
-+ 
-+/* Dingbats */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Dingbats, d050000l.ttf, Dingbats ) 
-+#endif 
-+#endif 
-+ 
-+/* Luxi Mono Bold */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Mono_Bold, luximb.ttf, Luxi Mono Bold ) 
-+#endif 
-+#endif 
-+ 
-+/* Luxi Mono Bold Oblique */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Mono_Bold_Oblique, luximbi.ttf, Luxi Mono Bold Oblique ) 
-+#endif 
-+#endif 
-+ 
-+/* Luxi Mono Regular */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Mono_Regular, luximr.ttf, Luxi Mono Regular ) 
-+#endif 
-+#endif 
-+ 
-+/* Luxi Mono Oblique */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Mono_Oblique, luximri.ttf, Luxi Mono Oblique ) 
-+#endif 
-+#endif 
-+ 
-+/* Luxi Serif Bold */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Serif_Bold, luxirb.ttf, Luxi Serif Bold ) 
-+#endif 
-+#endif 
-+ 
-+/* Luxi Serif Bold Oblique */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Serif_Bold_Oblique, luxirbi.ttf, Luxi Serif Bold Oblique ) 
-+#endif 
-+#endif 
-+ 
-+/* Luxi Serif Regular */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Serif_Regular, luxirr.ttf, Luxi Serif Regular ) 
-+#endif 
-+#endif 
-+ 
-+/* Luxi Serif Oblique */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Serif_Oblique, luxirri.ttf, Luxi Serif Oblique ) 
-+#endif 
-+#endif 
-+ 
-+/* Luxi Sans Bold */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Sans_Bold, luxisb.ttf, Luxi Sans Bold ) 
-+#endif 
-+#endif 
-+ 
-+/* Luxi Sans Bold Oblique */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Sans_Bold_Oblique, luxisbi.ttf, Luxi Sans Bold Oblique ) 
-+#endif 
-+#endif 
-+ 
-+/* Luxi Sans Regular */ 
-+#ifdef UNX 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular ) 
-+#endif 
-+#endif 
-+#ifdef WNT 
-+#ifndef WITHOUT_EXTRA_FONT 
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Sans_Regular, luxisr.ttf, Luxi Sans Regular ) 
-+#endif 
-+#endif 
-+ 
-+/* Luxi Sans Oblique */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Luxi_Sans_Oblique, luxisri.ttf, Luxi Sans Oblique )
-+#endif
-+#endif
-+
-+/* Gentium */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Gentium, GenR102.TTF, Gentium )
-+#endif
-+#endif
-+
-+/* Gentium Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_Gentium_Italic, GenI102.TTF, Gentium Italic )
-+#endif
-+#endif
-+
-+/* GentiumAlt */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_GentiumAlt, GenAR102.TTF, GentiumAlt )
-+#endif
-+#endif
-+
-+/* GentiumAlt Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_GentiumAlt_Italic, GenAI102.TTF, GentiumAlt Italic )
-+#endif
-+#endif
-+
-+/* MgOpen Canonica Bold */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_MgOpen_Canonica_Bold, MgOpenCanonicaBold.ttf, MgOpen Canonica Bold )
-+#endif
-+#endif
-+
-+/* MgOpen Canonica Bold Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_MgOpen_Canonica_Bold_Italic, MgOpenCanonicaBoldItalic.ttf, MgOpen Canonica Bold Italic)
-+#endif
-+#endif
-+
-+/* MgOpen Canonica Italic */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_MgOpen_Canonica_Italic, MgOpenCanonicaItalic.ttf, MgOpen Canonica Italic )
-+#endif
-+#endif
-+
-+/* MgOpen Canonica Regular */
-+#ifdef UNX
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTUNX_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
-+#endif
-+#endif
-+#ifdef WNT
-+#ifndef WITHOUT_EXTRA_FONT
-+STD_FONTWIN_FILE( gid_File_Fnt_MgOpen_Canonica_Regular, MgOpenCanonicaRegular.ttf, MgOpen Canonica )
-+#endif
-+#endif
-diff -Naur null/.svn/text-base/file_gallery_accessories.scp.svn-base scp2/source/accessories/.svn/text-base/file_gallery_accessories.scp.svn-base
---- null/.svn/text-base/file_gallery_accessories.scp.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/file_gallery_accessories.scp.svn-base	2008-03-10 21:05:17.000000000 +0100
-@@ -0,0 +1,146 @@
-+/*************************************************************************
-+*
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: file_gallery_accessories.scp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+/* *** KAMI Extras *** */
-+
-+/* ** Gallery ** */
-+
-+#ifndef WITHOUT_EXTRA_GALLERY
-+
-+File gid_File_Extra_Gallery_KAMI
-+    Dir = gid_Dir_Gallery;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigallery.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Draws_People_KAMI
-+    Dir = gid_Dir_Gallery_Draws_People;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigallerydrawspeople.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Plants_KAMI
-+    Dir = gid_Dir_Gallery_Photos_Plants;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotosplants.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Celebration_KAMI
-+    Dir = gid_Dir_Gallery_Photos_Celebration;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotoscelebration.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Fauna_KAMI
-+    Dir = gid_Dir_Gallery_Photos_Fauna;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotosfauna.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Flowers_KAMI
-+    Dir = gid_Dir_Gallery_Photos_Flowers;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotosflowers.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_FoodsandDrinks_KAMI
-+    Dir = gid_Dir_Gallery_Photos_FoodsandDrinks;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotosfoodsanddrinks.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Humans_KAMI
-+    Dir = gid_Dir_Gallery_Photos_Humans;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotoshumans.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Landscapes_KAMI
-+    Dir = gid_Dir_Gallery_Photos_Landscapes;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotoslandscapes.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Buildings_KAMI
-+    Dir = gid_Dir_Gallery_Photos_Buildings;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotosbuildings.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Objects_KAMI
-+    Dir = gid_Dir_Gallery_Photos_Objects;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotosobjects.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Cities_KAMI
-+    Dir = gid_Dir_Gallery_Photos_Cities;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotoscities.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Space_KAMI
-+    Dir = gid_Dir_Gallery_Photos_Space;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotosspace.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Statues_KAMI
-+    Dir = gid_Dir_Gallery_Photos_Statues;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotosstatues.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Photos_Travel_KAMI
-+    Dir = gid_Dir_Gallery_Photos_Travel;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryphotostravel.zip";
-+End
-+
-+File gid_File_Extra_Gallery_Elements_Bullets2_KAMI
-+    Dir = gid_Dir_Gallery_Elements_Bullets2;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigalleryelementsbullets2.zip";
-+End
-+
-+File gid_File_Extra_Gallery_NONFREE_KAMI
-+    Dir = gid_Dir_Gallery;
-+    ARCHIVE_TXT_FILE_BODY;
-+    Name = "kamigallerynonfree.zip";
-+End
-+
-+#endif
-diff -Naur null/.svn/text-base/file_samples_accessories.scp.svn-base scp2/source/accessories/.svn/text-base/file_samples_accessories.scp.svn-base
---- null/.svn/text-base/file_samples_accessories.scp.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/file_samples_accessories.scp.svn-base	2008-03-10 21:05:17.000000000 +0100
-@@ -0,0 +1,88 @@
-+/*************************************************************************
-+*
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: file_samples_accessories.scp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+/* *** KAMI Extras *** */
-+
-+/* ** Samples ** */
-+
-+#ifndef WITHOUT_EXTRA_SAMPLE
-+
-+File gid_File_Extra_Samples_KAMI
-+    Dir = gid_Dir_Samples_Language;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamisamples);
-+End
-+
-+File gid_File_Extra_Samples_Documentations_KAMI
-+    Dir = gid_Dir_Samples_Documentations;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamisamplesdocumentation);
-+End
-+
-+File gid_File_Extra_Samples_Advertisement_KAMI
-+    Dir = gid_Dir_Samples_Advertisement;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamisamplesadvertisement);
-+End
-+
-+/* ** Samples - NON FREE** */
-+
-+File gid_File_Extra_Samples_NONFREE_KAMI
-+    Dir = gid_Dir_Samples_Language;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamisamplesnonfree);
-+End
-+
-+File gid_File_Extra_Samples_NONFREE_Documentations_KAMI
-+    Dir = gid_Dir_Samples_Documentations;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamisamplesnonfreedocumentation);
-+End
-+
-+File gid_File_Extra_Samples_NONFREE_Advertisement_KAMI
-+    Dir = gid_Dir_Samples_Advertisement;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamisamplesnonfreeadvertisement);
-+End
-+
-+#endif
-diff -Naur null/.svn/text-base/file_templates_accessories.scp.svn-base scp2/source/accessories/.svn/text-base/file_templates_accessories.scp.svn-base
---- null/.svn/text-base/file_templates_accessories.scp.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/file_templates_accessories.scp.svn-base	2008-03-10 21:05:17.000000000 +0100
-@@ -0,0 +1,186 @@
-+/*************************************************************************
-+*
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: file_templates_accessories.scp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+/* *** KAMI Extras *** */
-+
-+/* ** Templates ** */
-+
-+#ifndef WITHOUT_EXTRA_TEMPLATE
-+
-+File gid_File_Extra_Templates_KAMI
-+    Dir = gid_Dir_Template_Language;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplates);
-+End
-+
-+File gid_File_Extra_Templates_Layout_KAMI
-+    Dir = gid_Dir_Template_Layout;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplateslayout);
-+End
-+
-+File gid_File_Extra_Templates_Present_KAMI
-+    Dir = gid_Dir_Template_Presnt;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatespresent);
-+End
-+
-+File gid_File_Extra_Templates_Educate_KAMI
-+    Dir = gid_Dir_Template_Educate;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplateseducate);
-+End
-+
-+File gid_File_Extra_Templates_Finance_KAMI
-+    Dir = gid_Dir_Template_Finance;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesfinance);
-+End
-+
-+File gid_File_Extra_Templates_Forms_KAMI
-+    Dir = gid_Dir_Template_Forms;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesforms);
-+End
-+
-+File gid_File_Extra_Templates_Misc_KAMI
-+    Dir = gid_Dir_Template_Misc;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesmisc);
-+End
-+
-+File gid_File_Extra_Templates_Officorr_KAMI
-+    Dir = gid_Dir_Template_Officorr;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesofficorr);
-+End
-+
-+File gid_File_Extra_Templates_Offimisc_KAMI
-+    Dir = gid_Dir_Template_Offimisc;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesoffimisc);
-+End
-+
-+File gid_File_Extra_Templates_Personal_KAMI
-+    Dir = gid_Dir_Template_Personal;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatespersonal);
-+End
-+
-+/* ** Templates - NON FREE ** */
-+
-+File gid_File_Extra_Templates_NONFREE_KAMI
-+    Dir = gid_Dir_Template_Language;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesnonfree);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Layout_KAMI
-+    Dir = gid_Dir_Template_Layout;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesnonfreelayout);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Present_KAMI
-+    Dir = gid_Dir_Template_Presnt;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesnonfreepresent);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Educate_KAMI
-+    Dir = gid_Dir_Template_Educate;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesnonfreeeducate);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Finance_KAMI
-+    Dir = gid_Dir_Template_Finance;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesnonfreefinance);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Forms_KAMI
-+    Dir = gid_Dir_Template_Forms;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesnonfreeforms);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Misc_KAMI
-+    Dir = gid_Dir_Template_Misc;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesnonfreemisc);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Officorr_KAMI
-+    Dir = gid_Dir_Template_Officorr;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesnonfreeofficorr);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Offimisc_KAMI
-+    Dir = gid_Dir_Template_Offimisc;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesnonfreeoffimisc);
-+End
-+
-+File gid_File_Extra_Templates_NONFREE_Personal_KAMI
-+    Dir = gid_Dir_Template_Personal;
-+    TXT_FILE_BODY;
-+    Styles = (ARCHIVE, DONT_OVERWRITE);
-+    EXTRA_ALL_LANG(kamitemplatesnonfreepersonal);
-+End
-+
-+#endif
-diff -Naur null/.svn/text-base/makefile.mk.svn-base scp2/source/accessories/.svn/text-base/makefile.mk.svn-base
---- null/.svn/text-base/makefile.mk.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/makefile.mk.svn-base	2008-03-10 21:05:17.000000000 +0100
-@@ -0,0 +1,70 @@
-+#*************************************************************************
-+#
-+#   OpenOffice.org - a multi-platform office productivity suite
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.0 $
-+#
-+#   last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+#
-+#   The Contents of this file are made available subject to
-+#   the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+#     GNU Lesser General Public License Version 2.1
-+#     =============================================
-+#     Copyright 2005 by Sun Microsystems, Inc.
-+#     901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#     This library is free software; you can redistribute it and/or
-+#     modify it under the terms of the GNU Lesser General Public
-+#     License version 2.1, as published by the Free Software Foundation.
-+#
-+#     This library is distributed in the hope that it will be useful,
-+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#     Lesser General Public License for more details.
-+#
-+#     You should have received a copy of the GNU Lesser General Public
-+#     License along with this library; if not, write to the Free Software
-+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#     MA  02111-1307  USA
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..
-+
-+PRJPCH=
-+
-+PRJNAME=scp2
-+TARGET=accessories
-+TARGETTYPE=CUI
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :	settings.mk
-+
-+SCP_PRODUCT_TYPE=osl
-+PARFILES= \
-+        module_accessories.par             \
-+        module_gallery_accessories.par     \
-+        module_templates_accessories.par   \
-+        module_samples_accessories.par     \
-+        module_font_accessories.par        \
-+        file_accessories.par               \
-+        file_gallery_accessories.par       \
-+        file_templates_accessories.par     \
-+        file_samples_accessories.par       \
-+        file_font_accessories.par
-+
-+ULFFILES= \
-+        module_accessories.ulf             \
-+        module_gallery_accessories.ulf     \
-+        module_templates_accessories.ulf   \
-+        module_samples_accessories.ulf     \
-+        module_font_accessories.ulf
-+
-+
-+# --- File ---------------------------------------------------------
-+.INCLUDE :  target.mk
-diff -Naur null/.svn/text-base/module_accessories.scp.svn-base scp2/source/accessories/.svn/text-base/module_accessories.scp.svn-base
---- null/.svn/text-base/module_accessories.scp.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/module_accessories.scp.svn-base	2008-03-10 21:05:17.000000000 +0100
-@@ -0,0 +1,50 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_accessories.scp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+Module gid_Module_Optional_Accessories
-+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES);
-+    ParentID = gid_Module_Optional;
-+    Files = (
-+#ifndef WITHOUT_EXTRA_ACCESSORY
-+        gid_File_Basic_Premium,
-+	gid_File_Basic_OOoWikipedia
-+#endif
-+  ); 
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
-diff -Naur null/.svn/text-base/module_accessories.ulf.svn-base scp2/source/accessories/.svn/text-base/module_accessories.ulf.svn-base
---- null/.svn/text-base/module_accessories.ulf.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/module_accessories.ulf.svn-base	2008-03-21 15:57:30.000000000 +0100
-@@ -0,0 +1,40 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_accessories.ulf,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES]
-+en-US = "Accessories"
-+
-+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES]
-+en-US = "Useful %PRODUCTNAME accessories including various Galleries, Templates, Sample documents and Fonts."
-diff -Naur null/.svn/text-base/module_font_accessories.scp.svn-base scp2/source/accessories/.svn/text-base/module_font_accessories.scp.svn-base
---- null/.svn/text-base/module_font_accessories.scp.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/module_font_accessories.scp.svn-base	2008-03-10 21:05:17.000000000 +0100
-@@ -0,0 +1,195 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_accessories.scp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+#ifndef WITHOUT_EXTRA_FONT
-+
-+Module gid_Module_Optional_Accessories_Fonts
-+    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 );
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
-+
-+#endif
-diff -Naur null/.svn/text-base/module_font_accessories.ulf.svn-base scp2/source/accessories/.svn/text-base/module_font_accessories.ulf.svn-base
---- null/.svn/text-base/module_font_accessories.ulf.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/module_font_accessories.ulf.svn-base	2008-03-21 15:57:30.000000000 +0100
-@@ -0,0 +1,40 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_accessories.ulf,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_FONTS]
-+en-US = "Fonts"
-+
-+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_FONTS]
-+en-US = "Additional fonts for %PRODUCTNAME and other applications."
-diff -Naur null/.svn/text-base/module_gallery_accessories.scp.svn-base scp2/source/accessories/.svn/text-base/module_gallery_accessories.scp.svn-base
---- null/.svn/text-base/module_gallery_accessories.scp.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/module_gallery_accessories.scp.svn-base	2008-03-10 21:05:17.000000000 +0100
-@@ -0,0 +1,66 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_accessories.scp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+#ifndef WITHOUT_EXTRA_GALLERY
-+
-+Module gid_Module_Optional_Accessories_Gallery
-+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_GALLERY);
-+    ParentID = gid_Module_Optional_Accessories;
-+    Files = (
-+        gid_File_Extra_Gallery_KAMI,
-+        gid_File_Extra_Gallery_Draws_People_KAMI,
-+        gid_File_Extra_Gallery_Photos_Plants_KAMI,
-+        gid_File_Extra_Gallery_Photos_Celebration_KAMI,
-+        gid_File_Extra_Gallery_Photos_Fauna_KAMI,
-+        gid_File_Extra_Gallery_Photos_Flowers_KAMI,
-+        gid_File_Extra_Gallery_Photos_FoodsandDrinks_KAMI,
-+        gid_File_Extra_Gallery_Photos_Humans_KAMI,
-+        gid_File_Extra_Gallery_Photos_Landscapes_KAMI,
-+        gid_File_Extra_Gallery_Photos_Objects_KAMI,
-+        gid_File_Extra_Gallery_Photos_Buildings_KAMI,
-+        gid_File_Extra_Gallery_Photos_Cities_KAMI,
-+        gid_File_Extra_Gallery_Photos_Space_KAMI,
-+        gid_File_Extra_Gallery_Photos_Statues_KAMI
-+        gid_File_Extra_Gallery_Photos_Travel_KAMI,
-+        gid_File_Extra_Gallery_Elements_Bullets2_KAMI,
-+        gid_File_Extra_Gallery_NONFREE_KAMI );
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
-+
-+#endif
-diff -Naur null/.svn/text-base/module_gallery_accessories.ulf.svn-base scp2/source/accessories/.svn/text-base/module_gallery_accessories.ulf.svn-base
---- null/.svn/text-base/module_gallery_accessories.ulf.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/module_gallery_accessories.ulf.svn-base	2008-03-21 15:57:30.000000000 +0100
-@@ -0,0 +1,40 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_accessories.ulf,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
-+en-US = "Additional Gallery Themes"
-+
-+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_GALLERY]
-+en-US = "The %PRODUCTNAME Gallery contains more than 2900 elements in various themes."
-diff -Naur null/.svn/text-base/module_samples_accessories.scp.svn-base scp2/source/accessories/.svn/text-base/module_samples_accessories.scp.svn-base
---- null/.svn/text-base/module_samples_accessories.scp.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/module_samples_accessories.scp.svn-base	2008-03-10 21:05:17.000000000 +0100
-@@ -0,0 +1,77 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_accessories.scp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+#ifndef WITHOUT_EXTRA_SAMPLE
-+
-+Module gid_Module_Optional_Accessories_Samples
-+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_SAMPLES);
-+    ParentID = gid_Module_Optional_Accessories;
-+    Files = (
-+        gid_File_Extra_Samples_KAMI
-+        gid_File_Extra_Samples_NONFREE_KAMI  );
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
-+
-+Module gid_Module_Optional_Accessories_Documentations
-+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_DOCUMENTATIONS);
-+    ParentID = gid_Module_Optional_Accessories;
-+    Files = (
-+        gid_File_Extra_Samples_KAMI,
-+        gid_File_Extra_Samples_Documentations_KAMI
-+        gid_File_Extra_Samples_NONFREE_KAMI,
-+        gid_File_Extra_Samples_NONFREE_Documentations_KAMI );
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
-+
-+Module gid_Module_Optional_Accessories_Advertisement
-+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_ADVERTISEMENT);
-+    ParentID = gid_Module_Optional_Accessories;
-+    Files = (
-+        gid_File_Extra_Samples_KAMI,
-+        gid_File_Extra_Samples_Advertisement_KAMI
-+        gid_File_Extra_Samples_NONFREE_KAMI,
-+        gid_File_Extra_Samples_NONFREE_Advertisement_KAMI );
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
-+
-+#endif
-diff -Naur null/.svn/text-base/module_samples_accessories.ulf.svn-base scp2/source/accessories/.svn/text-base/module_samples_accessories.ulf.svn-base
---- null/.svn/text-base/module_samples_accessories.ulf.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/module_samples_accessories.ulf.svn-base	2008-03-21 15:57:30.000000000 +0100
-@@ -0,0 +1,53 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_accessories.ulf,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+[STR_NAME_MODULE_OPTIONAL_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."
-+
-diff -Naur null/.svn/text-base/module_templates_accessories.scp.svn-base scp2/source/accessories/.svn/text-base/module_templates_accessories.scp.svn-base
---- null/.svn/text-base/module_templates_accessories.scp.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/module_templates_accessories.scp.svn-base	2008-03-10 21:05:17.000000000 +0100
-@@ -0,0 +1,69 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_accessories.scp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+#ifndef WITHOUT_EXTRA_TEMPLATE
-+
-+Module gid_Module_Optional_Accessories_Templates
-+    MOD_NAME_DESC(MODULE_OPTIONAL_ACCESSORIES_TEMPLATES);
-+    ParentID = gid_Module_Optional_Accessories;
-+    Files = ( 
-+        gid_File_Extra_Templates_KAMI,
-+        gid_File_Extra_Templates_Layout_KAMI,
-+        gid_File_Extra_Templates_Present_KAMI,
-+        gid_File_Extra_Templates_Educate_KAMI,
-+        gid_File_Extra_Templates_Finance_KAMI,
-+        gid_File_Extra_Templates_Forms_KAMI,
-+        gid_File_Extra_Templates_Misc_KAMI,
-+        gid_File_Extra_Templates_Officorr_KAMI,
-+        gid_File_Extra_Templates_Offimisc_KAMI,
-+        gid_File_Extra_Templates_Personal_KAMI
-+        gid_File_Extra_Templates_NONFREE_KAMI,
-+        gid_File_Extra_Templates_NONFREE_Layout_KAMI,
-+        gid_File_Extra_Templates_NONFREE_Present_KAMI,
-+        gid_File_Extra_Templates_NONFREE_Educate_KAMI,
-+        gid_File_Extra_Templates_NONFREE_Finance_KAMI,
-+        gid_File_Extra_Templates_NONFREE_Forms_KAMI,
-+        gid_File_Extra_Templates_NONFREE_Misc_KAMI,
-+        gid_File_Extra_Templates_NONFREE_Officorr_KAMI,
-+        gid_File_Extra_Templates_NONFREE_Offimisc_KAMI,
-+        gid_File_Extra_Templates_NONFREE_Personal_KAMI );
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
-+
-+#endif
-diff -Naur null/.svn/text-base/module_templates_accessories.ulf.svn-base scp2/source/accessories/.svn/text-base/module_templates_accessories.ulf.svn-base
---- null/.svn/text-base/module_templates_accessories.ulf.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/accessories/.svn/text-base/module_templates_accessories.ulf.svn-base	2008-03-21 15:57:30.000000000 +0100
-@@ -0,0 +1,42 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_accessories.ulf,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+
-+[STR_NAME_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES]
-+en-US = "Templates"
-+
-+[STR_DESC_MODULE_OPTIONAL_ACCESSORIES_TEMPLATES]
-+en-US = "Create perfect documents within seconds with document templates."
-+
+

Modified: trunk/patches/src680/scp2_extensions.diff
==============================================================================
--- trunk/patches/src680/scp2_extensions.diff	(original)
+++ trunk/patches/src680/scp2_extensions.diff	Tue Mar 25 14:47:10 2008
@@ -1,5 +1,5 @@
-diff -Naur null/file_extensions.scp scp2/source/extensions/file_extensions.scp
---- null/file_extensions.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/extensions/file_extensions.scp scp2/source/extensions/file_extensions.scp
+--- scp2/source/extensions/file_extensions.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/file_extensions.scp	2008-03-22 10:57:33.000000000 +0100
 @@ -0,0 +1,51 @@
 +/*************************************************************************
@@ -53,8 +53,8 @@
 +End
 +
 +#endif 
-diff -Naur null/makefile.mk scp2/source/extensions/makefile.mk
---- null/makefile.mk	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/extensions/makefile.mk scp2/source/extensions/makefile.mk
+--- scp2/source/extensions/makefile.mk	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/makefile.mk	2008-03-22 10:57:33.000000000 +0100
 @@ -0,0 +1,57 @@
 +#*************************************************************************
@@ -114,8 +114,8 @@
 +
 +# --- File ---------------------------------------------------------
 +.INCLUDE :  target.mk
-diff -Naur null/module_extensions.scp scp2/source/extensions/module_extensions.scp
---- null/module_extensions.scp	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/extensions/module_extensions.scp scp2/source/extensions/module_extensions.scp
+--- scp2/source/extensions/module_extensions.scp	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/module_extensions.scp	2008-03-23 12:54:42.000000000 +0100
 @@ -0,0 +1,61 @@
 +/*************************************************************************
@@ -179,8 +179,8 @@
 +End
 +#endif
 +					
-diff -Naur null/module_extensions.ulf scp2/source/extensions/module_extensions.ulf
---- null/module_extensions.ulf	1970-01-01 01:00:00.000000000 +0100
+diff -Naur scp2/source/extensions/module_extensions.ulf scp2/source/extensions/module_extensions.ulf
+--- scp2/source/extensions/module_extensions.ulf	1970-01-01 01:00:00.000000000 +0100
 +++ scp2/source/extensions/module_extensions.ulf	2008-03-22 10:57:33.000000000 +0100
 @@ -0,0 +1,43 @@
 +/*************************************************************************
@@ -226,316 +226,4 @@
 +
 +[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SDEXT]
 +en-US = "SUN Presentation Minimizer"
-diff -Naur null/.svn/entries scp2/source/extensions/.svn/entries
---- null/.svn/entries	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/.svn/entries	2008-03-25 00:27:23.000000000 +0100
-@@ -0,0 +1,76 @@
-+8
-+
-+dir
-+11990
-+svn+ssh://szalaik svn gnome org/svn/ooo-build/trunk/scratch/scp2/source/extensions
-+svn+ssh://szalaik svn gnome org/svn/ooo-build
-+
-+
-+
-+2008-03-21T09:54:04.313258Z
-+11976
-+szalaik
-+
-+
-+svn:special svn:externals svn:needs-lock
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+4072966c-c725-0410-ba1b-a990d1e8cb90
-+
-+file_extensions.scp
-+file
-+
-+
-+
-+
-+2008-03-21T14:57:30.000000Z
-+82d6342b54ab34402e37d5754bfd3150
-+2008-03-21T09:54:04.313258Z
-+11976
-+szalaik
-+
-+makefile.mk
-+file
-+
-+
-+
-+
-+2008-03-21T14:57:30.000000Z
-+54f870c1a744cb2669244ae00b3bf2d3
-+2008-03-19T10:12:48.549287Z
-+11941
-+szalaik
-+
-+module_extensions.scp
-+file
-+
-+
-+
-+
-+2008-03-21T14:57:30.000000Z
-+3a4b5bb0292646c8e46fff59fa0b0a4c
-+2008-03-19T10:12:48.549287Z
-+11941
-+szalaik
-+
-+module_extensions.ulf
-+file
-+
-+
-+
-+
-+2008-03-21T14:57:30.000000Z
-+42e8348d1db7f1eccec727acf5d2e116
-+2008-03-19T10:12:48.549287Z
-+11941
-+szalaik
-+
-diff -Naur null/.svn/format scp2/source/extensions/.svn/format
---- null/.svn/format	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/.svn/format	2008-03-21 15:57:30.000000000 +0100
-@@ -0,0 +1 @@
-+8
-diff -Naur null/.svn/text-base/file_extensions.scp.svn-base scp2/source/extensions/.svn/text-base/file_extensions.scp.svn-base
---- null/.svn/text-base/file_extensions.scp.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/.svn/text-base/file_extensions.scp.svn-base	2008-03-21 15:57:30.000000000 +0100
-@@ -0,0 +1,51 @@
-+/*************************************************************************
-+*
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: file_accessories.scp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/07/02 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+************************************************************************/
-+
-+#include "macros.inc"
-+
-+/* *** Additional Extensions *** */
-+
-+/* ** SUN Presentation Minimizer ** */
-+
-+#ifndef WITHOUT_EXTENSION_SDEXT
-+
-+File gid_File_Oxt_Sun_Presentation_Minimizer
-+    TXT_FILE_BODY;
-+    Styles = (PACKED);
-+    Dir = gid_Dir_Share_Extension_Install;
-+    Name = "/minimizer/sun-presentation-minimizer.oxt";
-+End
-+
-+#endif 
-diff -Naur null/.svn/text-base/makefile.mk.svn-base scp2/source/extensions/.svn/text-base/makefile.mk.svn-base
---- null/.svn/text-base/makefile.mk.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/.svn/text-base/makefile.mk.svn-base	2008-03-21 15:57:30.000000000 +0100
-@@ -0,0 +1,57 @@
-+#*************************************************************************
-+#
-+#   OpenOffice.org - a multi-platform office productivity suite
-+#
-+#   $RCSfile: makefile.mk,v $
-+#
-+#   $Revision: 1.0 $
-+#
-+#   last change: $Author: KAMI $ $Date: 2008/03/19 14:50:39 $
-+#
-+#   The Contents of this file are made available subject to
-+#   the terms of GNU Lesser General Public License Version 2.1.
-+#
-+#
-+#     GNU Lesser General Public License Version 2.1
-+#     =============================================
-+#     Copyright 2005 by Sun Microsystems, Inc.
-+#     901 San Antonio Road, Palo Alto, CA 94303, USA
-+#
-+#     This library is free software; you can redistribute it and/or
-+#     modify it under the terms of the GNU Lesser General Public
-+#     License version 2.1, as published by the Free Software Foundation.
-+#
-+#     This library is distributed in the hope that it will be useful,
-+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+#     Lesser General Public License for more details.
-+#
-+#     You should have received a copy of the GNU Lesser General Public
-+#     License along with this library; if not, write to the Free Software
-+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+#     MA  02111-1307  USA
-+#
-+#*************************************************************************
-+
-+PRJ=..$/..
-+
-+PRJPCH=
-+
-+PRJNAME=scp2
-+TARGET=extensions
-+TARGETTYPE=CUI
-+
-+# --- Settings -----------------------------------------------------
-+
-+.INCLUDE :	settings.mk
-+
-+SCP_PRODUCT_TYPE=osl
-+PARFILES= \
-+        module_extensions.par             \
-+        file_extensions.par
-+
-+ULFFILES= \
-+        module_extensions.ulf
-+
-+# --- File ---------------------------------------------------------
-+.INCLUDE :  target.mk
-diff -Naur null/.svn/text-base/module_extensions.scp.svn-base scp2/source/extensions/.svn/text-base/module_extensions.scp.svn-base
---- null/.svn/text-base/module_extensions.scp.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/.svn/text-base/module_extensions.scp.svn-base	2008-03-21 15:57:30.000000000 +0100
-@@ -0,0 +1,60 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_accessories.scp,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+#include "macros.inc"
-+
-+Module gid_Module_Optional_Extensions
-+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS);
-+    ParentID = gid_Module_Optional;
-+    Files = ( ); 
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
-+
-+/* ** SUN Presentation Minimizer ** */
-+
-+#ifndef WITHOUT_EXTENSION_SDEXT
-+Module gid_Module_Optional_Extensions_SDEXT
-+    MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SDEXT);
-+    ParentID = gid_Module_Optional_Extensions;
-+    Files = (
-+        gid_File_Oxt_Sun_Presentation_Minimizer );
-+    Minimal = NO;
-+    Default = YES;
-+    Styles = ( );
-+End
-+#endif
-+					
-\ Nincs Ãjsor a fÃjl vÃgÃn
-diff -Naur null/.svn/text-base/module_extensions.ulf.svn-base scp2/source/extensions/.svn/text-base/module_extensions.ulf.svn-base
---- null/.svn/text-base/module_extensions.ulf.svn-base	1970-01-01 01:00:00.000000000 +0100
-+++ scp2/source/extensions/.svn/text-base/module_extensions.ulf.svn-base	2008-03-21 15:57:30.000000000 +0100
-@@ -0,0 +1,43 @@
-+/*************************************************************************
-+ *
-+ *  OpenOffice.org - a multi-platform office productivity suite
-+ *
-+ *  $RCSfile: module_accessories.ulf,v $
-+ *
-+ *  $Revision: 1.0 $
-+ *
-+ *  last change: $Author: KAMI $ $Date: 2006/02/18 14:50:39 $
-+ *
-+ *  The Contents of this file are made available subject to
-+ *  the terms of GNU Lesser General Public License Version 2.1.
-+ *
-+ *
-+ *    GNU Lesser General Public License Version 2.1
-+ *    =============================================
-+ *    Copyright 2005 by Sun Microsystems, Inc.
-+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
-+ *
-+ *    This library is free software; you can redistribute it and/or
-+ *    modify it under the terms of the GNU Lesser General Public
-+ *    License version 2.1, as published by the Free Software Foundation.
-+ *
-+ *    This library is distributed in the hope that it will be useful,
-+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ *    Lesser General Public License for more details.
-+ *
-+ *    You should have received a copy of the GNU Lesser General Public
-+ *    License along with this library; if not, write to the Free Software
-+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ *    MA  02111-1307  USA
-+ *
-+ ************************************************************************/
-+
-+[STR_NAME_MODULE_OPTIONAL_EXTENSIONS]
-+en-US = "Extensions"
-+
-+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS]
-+en-US = "Useful %PRODUCTNAME extensions."
-+
-+[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SDEXT]
-+en-US = "SUN Presentation Minimizer"
+



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]