dba34b: merged DEV300m96

8 files changed, 72 insertions, 50 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 7c306e19f427..899059ec26b1 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -98,7 +98,7 @@ Module gid_Module_Root_Brand
              gid_Brand_File_Share_Xdg_JavaFilter,
              gid_Brand_File_Share_Xdg_Math,
              gid_Brand_File_Share_Xdg_Printeradmin,
-             gid_Brand_File_Share_Xdg_QStart,
+//             gid_Brand_File_Share_Xdg_QStart,
              gid_Brand_File_Share_Xdg_StartCenter,
              gid_Brand_File_Share_Xdg_Writer,
              gid_Brand_File_Txt_Package);
@@ -739,16 +739,16 @@ File gid_Brand_File_Share_Xdg_Printeradmin
 End
 #endif
 
-#if defined UNX && ! defined MACOSX
-#ifdef ENABLE_GTK
-File gid_Brand_File_Share_Xdg_QStart
-    TXT_FILE_BODY;
-    Dir = gid_Brand_Dir_Share_Xdg;
-    Styles = (PACKED,SCPZIP_REPLACE);
-    Name = "qstart.desktop";
-End
-#endif
-#endif
+//#if defined UNX && ! defined MACOSX
+//#ifdef ENABLE_GTK
+//File gid_Brand_File_Share_Xdg_QStart
+//    TXT_FILE_BODY;
+//    Dir = gid_Brand_Dir_Share_Xdg;
+//    Styles = (PACKED,SCPZIP_REPLACE);
+//    Name = "qstart.desktop";
+//End
+//#endif
+//#endif
 
 #if defined UNX && ! defined MACOSX
 File gid_Brand_File_Share_Xdg_Writer
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index cc805f9e8288..4b20c6de7cc1 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -965,6 +965,11 @@ Directory gid_Dir_Share_Template_Wizard
     DosName = "wizard";
 End
 
+Directory gid_Dir_Share_Template_Wizard_Bitmap
+    ParentID = gid_Dir_Share_Template_Wizard;
+    DosName = "bitmap";
+End
+
 Directory gid_Dir_Share_Template_Wizard_Letter
     ParentID = gid_Dir_Share_Template_Wizard;
     DosName = "letter";
@@ -1025,11 +1030,6 @@ Directory gid_Dir_Template_Wizard
     DIR_IDENT_ALL_LANG(wizard);
 End
 
-Directory gid_Dir_Template_Wizard_Bitmap
-    ParentID = gid_Dir_Template_Wizard;
-    DIR_IDENT_ALL_LANG(bitmap);
-End
-
 Directory gid_Dir_Template_Wizard_Web
     ParentID = gid_Dir_Template_Wizard;
     DIR_IDENT_ALL_LANG(web);
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index dbea12eee10c..ee8c46f2c33e 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -365,10 +365,9 @@ File gid_File_Extra_Tplpresntimpr_Lang
 End
 
 File gid_File_Extra_Tplwizbitmap
-    Dir = gid_Dir_Template_Wizard_Bitmap;
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    EXTRA_IDENT_ALL_LANG(tplwizbitmap.zip);
+    Dir = gid_Dir_Share_Template_Wizard_Bitmap;
+    ARCHIVE_TXT_FILE_BODY;
+    Name = "tplwizbitmap.zip";
 End
 
 File gid_File_Extra_Tplwizdesktop_Lang
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 607dc2e5cd2c..c3db2df825f3 100755
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -210,25 +210,25 @@ End
 
 #endif
 
-#ifdef UNX
-#ifdef ENABLE_GTK
-#ifdef ENABLE_SYSTRAY_GTK
-File gid_File_Lib_Egg_Tray
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX));
-End
-
-File gid_File_Lib_QStart_Gtk
-    Name = LIBNAME(qstart_gtk);
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = SCP2_OOO_BIN_DIR;
-End
-#endif
-#endif
-#endif
+//#ifdef UNX
+//#ifdef ENABLE_GTK
+//#ifdef ENABLE_SYSTRAY_GTK
+//File gid_File_Lib_Egg_Tray
+// TXT_FILE_BODY;
+// Styles = (PACKED);
+// Dir = SCP2_OOO_BIN_DIR;
+// Name = STRING(CONCAT3(libeggtray,DLLPOSTFIX,UNXSUFFIX));
+//End
+//
+//File gid_File_Lib_QStart_Gtk
+//    Name = LIBNAME(qstart_gtk);
+//    TXT_FILE_BODY;
+//    Styles = (PACKED);
+//    Dir = SCP2_OOO_BIN_DIR;
+//End
+//#endif
+//#endif
+//#endif
 
 STD_LIB_FILE( gid_File_Lib_Dba, dba)
 
@@ -353,9 +353,9 @@ File gid_File_Lib_Vbaswobj
     Styles = (PACKED);
     Dir = SCP2_OOO_BIN_DIR;
   #ifdef UNX
-    Name = STRING(CONCAT4(libvbaswobj,DLLPOSTFIX,.uno,UNXSUFFIX));
+    Name = STRING(CONCAT3(vbaswobj,.uno,UNXSUFFIX));
   #else
-    Name = STRING(CONCAT4(vbaswobj,DLLPOSTFIX,.uno,.dll));
+    Name = STRING(CONCAT3(vbaswobj,.uno,.dll));
   #endif
 End
 
@@ -1344,7 +1344,7 @@ STD_LIB_FILE( gid_File_Lib_Msfilter, msfilter)
 STD_LIB_FILE( gid_File_Lib_Sw , sw)
 STD_LIB_FILE( gid_File_Lib_Swui, swui)
 
-STD_UNO_LIB_FILE( gid_File_Lib_Msword, msword )
+STD_LIB_FILE( gid_File_Lib_Msword, msword )
 
 #if ! defined UNX
 File gid_File_Lib_Sysdtrans
diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp
index edaea2027944..cbd8ff609721 100644
--- a/scp2/source/ooo/file_resource_ooo.scp
+++ b/scp2/source/ooo/file_resource_ooo.scp
@@ -89,7 +89,7 @@ STD_RES_FILE( gid_File_Res_Spa, spa )
 STD_RES_FILE( gid_File_Res_Stt, stt )
 STD_RES_FILE( gid_File_Res_Sb, sb )
 
-STD_RES_FILE( gid_File_Res_Svs, svs )
+STD_RES_FILE( gid_File_Res_Svl, svl )
 
 STD_RES_FILE( gid_File_Res_Svt, svt )
 
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index fd4a390e0459..c01eea89817c 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -453,6 +453,7 @@ Module gid_Module_Root_Files_6
 	gid_File_Extra_Gallwwwgraf,
 	gid_File_Extra_Migration,
 	gid_File_Extra_Migration_Lang_Multi,
+	gid_File_Extra_Tplwizbitmap,
 	gid_File_Extra_Tplwizletter,
 	gid_File_Extra_Tplwizletter_en_US,
 	gid_File_Extra_Tplwizletter_de,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 8ffeadc2e99a..0769df7ed214 100755
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/scp2/source/ooo/module_lang_template.scp
@@ -35,7 +35,6 @@ Module gid_Module_Langpack_Basis_Template
              gid_File_Extra_Tpllayoutimpr_Lang,
              gid_File_Extra_Tplpresntimpr_Lang,
              gid_File_Extra_Tplwizagenda_Lang,
-             gid_File_Extra_Tplwizbitmap,
              gid_File_Extra_Tplwizdesktop_Lang,
              gid_File_Extra_Tplwizfax_Lang,
              gid_File_Extra_Tplwizletter_Lang,
@@ -86,9 +85,8 @@ Module gid_Module_Langpack_Resource_Template
              gid_File_Res_Sd,
              gid_File_Res_Sfx,
              gid_File_Res_Spa,
-             gid_File_Res_Svs,
+             gid_File_Res_Svl,
              gid_File_Res_Svt,
-             gid_File_Res_Svp,
              gid_File_Res_Svx,
              gid_File_Res_Cui,
              gid_File_Res_TextConversionDlgs,
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 3127cdd8b904..591c84a6a939 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -685,8 +685,32 @@ en-US = "Mongolian"
 [STR_DESC_MODULE_LANGPACK_MN]
 en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION"
 
-[STR_NAME_MODULE_LANGPACK_MY]
-en-US = "Burmese"
+[STR_NAME_MODULE_LANGPACK_OC]
+en-US = "Occitan"
 
-[STR_DESC_MODULE_LANGPACK_MY]
-en-US = "Installs Burmese (Myanmar) support in %PRODUCTNAME %PRODUCTVERSION"
+[STR_DESC_MODULE_LANGPACK_OC]
+en-US = "Installs Occitan support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_UG]
+en-US = "Uighur"
+
+[STR_DESC_MODULE_LANGPACK_UG]
+en-US = "Installs Uighur support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_SI]
+en-US = "Sinhala"
+
+[STR_DESC_MODULE_LANGPACK_SI]
+en-US = "Installs Sinhala support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_OM]
+en-US = "Oromo"
+
+[STR_DESC_MODULE_LANGPACK_OM]
+en-US = "Installs Oromo support in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_LANGPACK_AST]
+en-US = "Asturian"
+
+[STR_DESC_MODULE_LANGPACK_AST]
+en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION"