--- scp/inc/gid.inc.orig	2004-07-16 11:00:43 +0400
+++ scp/inc/gid.inc	2004-07-17 05:36:05 +0400
@@ -1431,16 +1431,22 @@
 #define GID_FILE_FNT_STARSYMB                   gid_File_Fnt_Starsymb
 #define GID_FILE_FNT_OPENSYMB                   gid_File_Fnt_Opensymb
 #define GID_FILE_FNT_STARDNG1                   gid_File_Fnt_Stardng1
-#define GID_FILE_FNT_VERA                       gid_File_Fnt_Vera
-#define GID_FILE_FNT_VERABD                     gid_File_Fnt_Verabd
-#define GID_FILE_FNT_VERABI                     gid_File_Fnt_Verabi
-#define GID_FILE_FNT_VERAIT                     gid_File_Fnt_Verait
-#define GID_FILE_FNT_VERAMONO                   gid_File_Fnt_Veramono
-#define GID_FILE_FNT_VERAMOBD                   gid_File_Fnt_Veramobd
-#define GID_FILE_FNT_VERAMOBI                   gid_File_Fnt_Veramobi
-#define GID_FILE_FNT_VERAMOIT                   gid_File_Fnt_Veramoit
-#define GID_FILE_FNT_VERASE                     gid_File_Fnt_Verase
-#define GID_FILE_FNT_VERASEBD                   gid_File_Fnt_Verasebd
+#define GID_FILE_FNT_NIMBUS                     gid_File_Fnt_Nimbus
+#define GID_FILE_FNT_NIMBUSBD                   gid_File_Fnt_Nimbusbd
+#define GID_FILE_FNT_NIMBUSBO                   gid_File_Fnt_Nimbusbo
+#define GID_FILE_FNT_NIMBUSOB                   gid_File_Fnt_Nimbusob
+#define GID_FILE_FNT_NIMBUSMONO                 gid_File_Fnt_Nimbusmono
+#define GID_FILE_FNT_NIMBUSMONOBD               gid_File_Fnt_Nimbusmonobd
+#define GID_FILE_FNT_NIMBUSMONOBO               gid_File_Fnt_Nimbusmonobo
+#define GID_FILE_FNT_NIMBUSMONOOB               gid_File_Fnt_Nimbusmonoob
+#define GID_FILE_FNT_NIMBUSROMAN                gid_File_Fnt_Nimbusroman
+#define GID_FILE_FNT_NIMBUSROMANBD              gid_File_Fnt_Nimbusromanbd
+#define GID_FILE_FNT_NIMBUSROMANBO              gid_File_Fnt_Nimbusromanbo
+#define GID_FILE_FNT_NIMBUSROMANOB              gid_File_Fnt_Nimbusromanob
+#define GID_FILE_FNT_NIMBUSCOND                 gid_File_Fnt_Nimbuscond
+#define GID_FILE_FNT_NIMBUSCONDBD               gid_File_Fnt_Nimbuscondbd
+#define GID_FILE_FNT_NIMBUSCONDBO               gid_File_Fnt_Nimbuscondbo
+#define GID_FILE_FNT_NIMBUSCONDOB               gid_File_Fnt_Nimbuscondob
 
 #define GID_FILE_SHELLNEW_SOFFICESMF            gid_File_Shellnew_Sofficesmf
 #define GID_FILE_SHELLNEW_SOFFICESDW            gid_File_Shellnew_Sofficesdw
--- scp/source/office/files.scp.orig	2004-07-16 11:00:50 +0400
+++ scp/source/office/files.scp	2004-07-17 05:36:05 +0400
@@ -2609,15 +2609,9 @@
 
 #ifndef WITHOUT_FONTS
 
-STD_FONTUNX_FILE( GID_FILE_FNT_VERABD, VeraBd.ttf, Vera Sans Bold)
-STD_FONTUNX_FILE( GID_FILE_FNT_VERABI, VeraBI.ttf, Vera Sans Bold Oblique)
-STD_FONTUNX_FILE( GID_FILE_FNT_VERAIT, VeraIt.ttf, Vera Sans Oblique)
-STD_FONTUNX_FILE( GID_FILE_FNT_VERAMONO, VeraMono.ttf, Vera Sans Mono)
-STD_FONTUNX_FILE( GID_FILE_FNT_VERAMOBD, VeraMoBd.ttf, Vera Sans Mono Bold)
-STD_FONTUNX_FILE( GID_FILE_FNT_VERAMOBI, VeraMoBI.ttf, Vera Sans Mono Bold Oblique)
-STD_FONTUNX_FILE( GID_FILE_FNT_VERAMOIT, VeraMoIt.ttf, Vera Sans Mono Oblique)
-STD_FONTUNX_FILE( GID_FILE_FNT_VERASE, VeraSe.ttf, Vera Serif)
-STD_FONTUNX_FILE( GID_FILE_FNT_VERASEBD, VeraSeBd.ttf, Vera Serif Bold)
+STD_FONTUNX_FILE( GID_FILE_FNT_NIMBUSBD, NimbusBd.ttf, Nimbus Sans L Bold)
+STD_FONTUNX_FILE( GID_FILE_FNT_NIMBUSBO, NimbusBO.ttf, Nimbus Sans L Bold Oblique)
+STD_FONTUNX_FILE( GID_FILE_FNT_NIMBUSOB, NimbusOb.ttf, Nimbus Sans L Oblique)
 
 #endif
 
@@ -2768,15 +2762,9 @@
 
 #ifndef WITHOUT_FONTS
 
-STD_FONTWIN_FILE( GID_FILE_FNT_VERABD, VeraBd.ttf, Vera Sans Bold)
-STD_FONTWIN_FILE( GID_FILE_FNT_VERABI, VeraBI.ttf, Vera Sans Bold Italic)
-STD_FONTWIN_FILE( GID_FILE_FNT_VERAIT, VeraIt.ttf, Vera Sans Italic)
-STD_FONTWIN_FILE( GID_FILE_FNT_VERAMONO, VeraMono.ttf, Vera Sans Mono)
-STD_FONTWIN_FILE( GID_FILE_FNT_VERAMOBD, VeraMoBd.ttf, Vera Sans Mono Bold)
-STD_FONTWIN_FILE( GID_FILE_FNT_VERAMOBI, VeraMoBI.ttf, Vera Sans Mono Bold Italic)
-STD_FONTWIN_FILE( GID_FILE_FNT_VERAMOIT, VeraMoIt.ttf, Vera Sans Mono Italic)
-STD_FONTWIN_FILE( GID_FILE_FNT_VERASE, VeraSe.ttf, Vera Serif)
-STD_FONTWIN_FILE( GID_FILE_FNT_VERASEBD, VeraSeBd.ttf, Vera Serif Bold)
+STD_FONTWIN_FILE( GID_FILE_FNT_NIMBUSBD, NimbusBd.ttf, Nimbus Sans L Bold)
+STD_FONTWIN_FILE( GID_FILE_FNT_NIMBUSBO, NimbusBO.ttf, Nimbus Sans L Bold Oblique)
+STD_FONTWIN_FILE( GID_FILE_FNT_NIMBUSOB, NimbusOb.ttf, Nimbus Sans L Oblique)
 
 #endif
 
--- scp/source/global/setupzip.scp.orig	2004-07-16 11:00:46 +0400
+++ scp/source/global/setupzip.scp	2004-07-17 05:36:05 +0400
@@ -572,7 +572,7 @@
 #endif
 
 #if defined (OSL_PRODUCT) && !defined(WITHOUT_FONTS)
-STD_FONTUNX_FILE( GID_FILE_FNT_VERA, Vera.ttf, Vera Sans)
+STD_FONTUNX_FILE( GID_FILE_FNT_NIMBUS, Nimbus.ttf, Nimbus Sans L)
 #endif
 
 #endif
@@ -588,7 +588,7 @@
 
 #ifdef OSL_PRODUCT
 
-STD_FONTWIN_FILE( GID_FILE_FNT_VERA, Vera.ttf, Vera Sans)
+STD_FONTWIN_FILE( GID_FILE_FNT_NIMBUS, Nimbus.ttf, Nimbus Sans L)
 
 #endif