diff options
24 files changed, 119 insertions, 74 deletions
diff --git a/configure.in b/configure.in index 6fb42ca4978f..f210dd4b7414 100755 --- a/configure.in +++ b/configure.in @@ -1186,23 +1186,19 @@ AC_ARG_WITH(dict, ], ,) -AC_ARG_WITH(intro-bitmaps, - AS_HELP_STRING([--with-intro-bitmaps], - [Prefer the specified intro bitmaps over the the default one. - Can be more than one (separated by commas), the order means priority of - fallback if the first does not exist (in the installed tree).]) - [ - Usage: --with-intro-bitmaps=/path/my_lo_intro.bmp - ], -,) +AC_ARG_WITH(intro-bitmap, +[ --with-intro-bitmap Prefer the specified intro bitmap over the + the default one. -AC_ARG_WITH(about-bitmaps, - AS_HELP_STRING([--with-about-bitmaps], - [Similarly to --with-intro-bitmaps, this allows specification of bitmaps for the About box.]) - [ - Usage: --with-about-bitmaps=/path/my_lo_about.bmp - ], -,) + Usage: --with-intro-bitmap=/path/my_ooo_intro.png +],,) + +AC_ARG_WITH(about-bitmap, +[ --with-about-bitmap Similarly to --with-intro-bitmap, this allows + specification of bitmap for the About box. + + Usage: --with-about-bitmap=/path/my_ooo_about.png +],,) AC_ARG_WITH(vendor, AS_HELP_STRING([--with-vendor], @@ -4391,12 +4387,16 @@ int main(int argc, char **argv) { else return 1; } ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR([no. you need at least db 4.1])]) - save_LIBS="$LIBS" + DB_LIB= for dbver in '' -5.1 5.1 -5.0 5.0 -5 5 -4.8 4.8 -4.7 4.7 -4 4; do - AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ]) + AC_CHECK_LIB(db$dbver, dbopen, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] , + AC_CHECK_LIB(db$dbver, __db185_open, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; break; ] + ) + ) done - AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ]) - LIBS="$save_LIBS" + if test -z "$DB_LIB" ; then + AC_MSG_ERROR([db not installed or functional]) + fi SCPDEFS="$SCPDEFS -DSYSTEM_DB" else AC_MSG_RESULT([internal]) @@ -7846,43 +7846,33 @@ else fi AC_SUBST(WITH_DICT) -AC_MSG_CHECKING([for additional 'intro' bitmaps]) -INTRO_BITMAPS= -if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then - INTRO_BITMAPS= +AC_MSG_CHECKING([for another 'intro' bitmap]) +INTRO_BITMAP= +if test -z "$with_intro_bitmap" -o "$with_intro_bitmap" = "no" ; then + INTRO_BITMAP= AC_MSG_RESULT([none]) else - for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do - case "$bitmap" in - *.bmp) ;; - *) bitmap= ; AC_MSG_WARN([Intro bitmaps should be .bmp files!]) ;; - esac - if test -n "$bitmap" ; then - INTRO_BITMAPS="$INTRO_BITMAPS $bitmap" - fi - done - AC_MSG_RESULT([$INTRO_BITMAPS]) + case "$with_intro_bitmap" in + *.png) INTRO_BITMAP="$with_intro_bitmap" ;; + *) AC_MSG_WARN([Intro bitmap should be a .png file!]) ;; + esac + AC_MSG_RESULT([$INTRO_BITMAP]) fi -AC_SUBST(INTRO_BITMAPS) +AC_SUBST(INTRO_BITMAP) -AC_MSG_CHECKING([for additional 'about' bitmaps]) -ABOUT_BITMAPS= -if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then - ABOUT_BITMAPS= +AC_MSG_CHECKING([for another 'about' bitmap]) +ABOUT_BITMAP= +if test -z "$with_about_bitmap" -o "$with_about_bitmap" = "no" ; then + ABOUT_BITMAP= AC_MSG_RESULT([none]) else - for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do - case "$bitmap" in - *.bmp) ;; - *) bitmap= ; AC_MSG_WARN([About bitmaps should be .bmp files!]) ;; - esac - if test -n "$bitmap" ; then - ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap" - fi - done - AC_MSG_RESULT([$ABOUT_BITMAPS]) + case "$with_about_bitmap" in + *.png) ABOUT_BITMAP="$with_about_bitmap" ;; + *) AC_MSG_WARN([About bitmap should be a .png file!]) ;; + esac + AC_MSG_RESULT([$ABOUT_BITMAP]) fi -AC_SUBST(ABOUT_BITMAPS) +AC_SUBST(ABOUT_BITMAP) OOO_VENDOR= AC_MSG_CHECKING([for vendor]) diff --git a/instsetoo_native/res/nologobanner.bmp b/instsetoo_native/res/nologobanner.bmp Binary files differnew file mode 100644 index 000000000000..3bd088711545 --- /dev/null +++ b/instsetoo_native/res/nologobanner.bmp diff --git a/instsetoo_native/res/nologoinstall.bmp b/instsetoo_native/res/nologoinstall.bmp Binary files differindex 25b5b11bed20..8af9fc41f709 100644 --- a/instsetoo_native/res/nologoinstall.bmp +++ b/instsetoo_native/res/nologoinstall.bmp diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index df2515b085f0..e3db4b007777 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -190,7 +190,7 @@ $(foreach,i,$(alllangiso) ooodevhelppack_$i) : $(ADDDEPS) $(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS) $(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS) - + $(foreach,i,$(alllangiso) ure_$i) : $(ADDDEPS) $(foreach,i,$(alllangiso) broffice_$i) : $(ADDDEPS) @@ -340,11 +340,21 @@ hack_msitemplates .PHONY: $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp + $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp + $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp + $(RM) $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp + $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp + $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp + $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp + $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp + $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp + $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp + $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp .IF "$(OS)" == "WNT" diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index dccd310e7ef2..2ab17bff20a2 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -57,7 +57,7 @@ LibreOffice PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc4 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 @@ -126,7 +126,7 @@ LibreOffice_wJRE PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc4 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 @@ -191,7 +191,7 @@ LibreOffice_Dev PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc4 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION @@ -269,7 +269,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3 LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc4 LICENSENAME LGPL SERVICESPROJEKT 1 SETSTATICPATH 1 @@ -310,7 +310,7 @@ LibreOffice_SDK PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc4 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3 @@ -355,7 +355,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc2 + SHORT_PRODUCTEXTENSION rc4 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION SDK @@ -83,4 +83,4 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 http://download.go-oo.org/extern 185d60944ea767075d27247c3162b3bc-unowinreg.dll http://www.numbertext.org/linux -c8fc33ad1efb77155f61e0e4ba8d3e9e-LinLibertineG-20101021.zip +881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index c678e7424cd7..2f6e606ff9c3 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -29,6 +29,7 @@ FolderItem gid_Folderitem_Sbase Name = "%PRODUCTNAME Base"; + Name (pt-BR) = "%PRODUCTNAME_BR Base"; ModuleID = gid_Module_Prg_Base_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sbase; diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp index 36cd965cb53b..c32ffa061546 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -29,6 +29,7 @@ FolderItem gid_Folderitem_Scalc Name = "%PRODUCTNAME Calc"; + Name (pt-BR) = "%PRODUCTNAME_BR Calc"; ModuleID = gid_Module_Prg_Calc_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Scalc; diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp index 4a73948ced39..2a302e57ea41 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -29,6 +29,7 @@ FolderItem gid_Folderitem_Sdraw Name = "%PRODUCTNAME Draw"; + Name (pt-BR) = "%PRODUCTNAME_BR Draw"; ModuleID = gid_Module_Prg_Draw_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Sdraw; diff --git a/scp2/source/extensions/directory_extensions.scp b/scp2/source/extensions/directory_extensions.scp index 265d8aaba47c..e731d3371aef 100644 --- a/scp2/source/extensions/directory_extensions.scp +++ b/scp2/source/extensions/directory_extensions.scp @@ -96,6 +96,17 @@ End /* ** Lightproof ** */ +#ifdef WITH_EXTENSION_LIGHTPROOF + +Directory gid_Brand_Dir_Share_Extensions_LightProof + ParentID = gid_Brand_Dir_Share_Extensions; + DosName (en-US) = "lightproof-en-US-0.1"; + DosName (hu) = "lightproof-hu-1.2"; + DosName = "lightproof"; +End + +#endif + /* ** Numbertext ** */ #ifdef WITH_EXTENSION_NUMBERTEXT @@ -245,12 +256,13 @@ End Directory gid_Brand_Dir_Share_Extensions_Sun_Template_Pack ParentID = gid_Brand_Dir_Share_Extensions; - DosName (en-US)= "Sun_ODF_Template_Pack_en-US"; + DosName (en-US) = "Sun_ODF_Template_Pack_en-US"; DosName (de) = "Sun_ODF_Template_Pack_de"; - DosName (it) = "Sun_ODF_Template_Pack_it"; - DosName (fr) = "Sun_ODF_Template_Pack_fr"; DosName (es) = "Sun_ODF_Template_Pack_es"; + DosName (fr) = "Sun_ODF_Template_Pack_fr"; DosName (hu) = "Sun_ODF_Template_Pack_hu"; + DosName (it) = "Sun_ODF_Template_Pack_it"; + DosName = "Sun_ODF_Template_Pack"; End #endif diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 85b31a860c5f..cb5cd33ed479 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -111,9 +111,9 @@ End File gid_File_Oxt_LightProof TXT_FILE_BODY; Styles = (PACKED, ARCHIVE); - Dir = gid_Brand_Dir_Share_Extensions_Install; - Name (hu) = "lightproof-hu-1.2.oxt"; + Dir = gid_Brand_Dir_Share_Extensions_LightProof; Name (en-US) = "lightproof-en-US-0.1.oxt"; + Name (hu) = "lightproof-hu-1.2.oxt"; End #endif @@ -216,7 +216,7 @@ End File gid_File_Oxt_Barcode TXT_FILE_BODY; Styles = (PACKED, ARCHIVE); - Dir = gid_Brand_Dir_Share_Extensions_Validator; + Dir = gid_Brand_Dir_Share_Extensions_Barcode; Name = "Barcode.oxt"; End diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 11c56e244aee..6cdd35d3a8c0 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -133,6 +133,7 @@ Module gid_Module_Optional_Extensions_LightProof Default = YES; Styles = ( ); End + #endif /* ** Numbertext ** */ diff --git a/scp2/source/extensions/module_extensions_lightproof.scp b/scp2/source/extensions/module_extensions_lightproof.scp index 7caa60178b76..58aa59ad17c4 100644 --- a/scp2/source/extensions/module_extensions_lightproof.scp +++ b/scp2/source/extensions/module_extensions_lightproof.scp @@ -46,8 +46,7 @@ Module gid_Module_Optional_Extensions_LightProof_Template Name = "gid_Module_Optional_Extensions_LightProof_Template"; Description = "gid_Module_Optional_Extensions_LightProof_Template"; Styles = (TEMPLATEMODULE); - Files = ( - gid_File_Oxt_LightProof ); + Files = ( gid_File_Oxt_LightProof ); Minimal = NO; Default = YES; End diff --git a/scp2/source/extensions/module_extensions_sun_templates.scp b/scp2/source/extensions/module_extensions_sun_templates.scp index bd6fe0a59d77..6e5897ee58f4 100644 --- a/scp2/source/extensions/module_extensions_sun_templates.scp +++ b/scp2/source/extensions/module_extensions_sun_templates.scp @@ -46,8 +46,7 @@ Module gid_Module_Optional_Extensions_Sun_T_Pack_Template Name = "gid_Module_Optional_Extensions_Sun_T_Pack_Template"; Description = "gid_Module_Optional_Extensions_Sun_T_Pack_Template"; Styles = (TEMPLATEMODULE); - Files = ( - gid_File_Optional_Extensions_Sun_Template_Pack ); + Files = ( gid_File_Optional_Extensions_Sun_Template_Pack ); Minimal = NO; Default = YES; End diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index db7b0c3794dd..e9a0708331b5 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -29,6 +29,7 @@ FolderItem gid_Folderitem_Simpress Name = "%PRODUCTNAME Impress"; + Name (pt-BR) = "%PRODUCTNAME_BR Impress"; ModuleID = gid_Module_Prg_Impress_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Simpress; diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index 2decfb20811c..49f1b8cb8a4b 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -29,6 +29,7 @@ FolderItem gid_Folderitem_Smath Name = "%PRODUCTNAME Math"; + Name (pt-BR) = "%PRODUCTNAME_BR Math"; ModuleID = gid_Module_Prg_Math_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Smath; diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp index b6ef81eff36d..db3e5b1679c9 100644 --- a/scp2/source/ooo/folderitem_ooo.scp +++ b/scp2/source/ooo/folderitem_ooo.scp @@ -29,6 +29,7 @@ FolderItem gid_Folderitem_Soffice Name = "%PRODUCTNAME"; + Name (pt-BR) = "%PRODUCTNAME_BR"; ModuleID = gid_Module_Root; FolderID = gid_Folder_Staroffice51; FileID = gid_Brand_File_Bin_Soffice; @@ -42,6 +43,7 @@ End FolderItem gid_Folderitem_Soffice_Desktop Name = "%PRODUCTNAME %PRODUCTVERSION"; + Name (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION"; ModuleID = gid_Module_Root; FolderID = PREDEFINED_DESKTOP; FileID = gid_Brand_File_Bin_Soffice; diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf index 69f66985f100..64604c3cf424 100644 --- a/scp2/source/ooo/module_helppack.ulf +++ b/scp2/source/ooo/module_helppack.ulf @@ -343,6 +343,12 @@ en-US = "Catalan" [STR_DESC_MODULE_HELPPACK_CA] en-US = "Installs Catalan help in %PRODUCTNAME %PRODUCTVERSION" +[STR_NAME_MODULE_HELPPACK_CA_XV] +en-US = "Catalan (Valencian)" + +[STR_DESC_MODULE_HELPPACK_CA_XV] +en-US = "Installs Catalan (Valencian) help in %PRODUCTNAME %PRODUCTVERSION" + [STR_NAME_MODULE_HELPPACK_DA] en-US = "Danish" @@ -517,6 +523,12 @@ en-US = "Assamese" [STR_DESC_MODULE_HELPPACK_AS_IN] en-US = "Installs Assamese help in %PRODUCTNAME %PRODUCTVERSION" +[STR_NAME_MODULE_HELPPACK_AST] +en-US = "Asturian" + +[STR_DESC_MODULE_HELPPACK_AST] +en-US = "Installs Asturian help in %PRODUCTNAME %PRODUCTVERSION" + [STR_NAME_MODULE_HELPPACK_RW] en-US = "Kinyarwanda" diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 479b524ed9e5..f2771c2332be 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -343,6 +343,12 @@ en-US = "Catalan" [STR_DESC_MODULE_LANGPACK_CA] en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION" +[STR_NAME_MODULE_LANGPACK_CA_XV] +en-US = "Catalan (Valencian)" + +[STR_DESC_MODULE_LANGPACK_CA_XV] +en-US = "Installs Catalan (Valencian) support in %PRODUCTNAME %PRODUCTVERSION" + [STR_NAME_MODULE_LANGPACK_DA] en-US = "Danish" @@ -517,6 +523,12 @@ en-US = "Assamese" [STR_DESC_MODULE_LANGPACK_AS_IN] en-US = "Installs Assamese 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" + [STR_NAME_MODULE_LANGPACK_RW] en-US = "Kinyarwanda" @@ -760,7 +772,7 @@ en-US = "Installs Konkani support in %PRODUCTNAME %PRODUCTVERSION" [STR_NAME_MODULE_LANGPACK_KS] en-US = "Kashmiri" -[STR_DESC_MODULE_LANGPACK_KS +[STR_DESC_MODULE_LANGPACK_KS] en-US = "Installs Kashmiri support in %PRODUCTNAME %PRODUCTVERSION" [STR_NAME_MODULE_LANGPACK_KY] diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index 6aa7c4eb8c03..24a2cba71dd0 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -627,6 +627,7 @@ RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Capabi ModuleID = gid_Module_Root; Name = "ApplicationName"; Value = "%PRODUCTNAME %PRODUCTVERSION"; + Value (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION"; Styles = (); End diff --git a/scp2/source/quickstart/folderitem_quickstart.scp b/scp2/source/quickstart/folderitem_quickstart.scp index b533637cc788..9de0a7ce36b4 100644 --- a/scp2/source/quickstart/folderitem_quickstart.scp +++ b/scp2/source/quickstart/folderitem_quickstart.scp @@ -30,6 +30,7 @@ FolderItem gid_Folderitem_Exe_Quickstart ModuleID = gid_Module_Optional_Quickstart; Name = "%PRODUCTNAME %PRODUCTVERSION"; + Name (pt-BR) = "%PRODUCTNAME_BR %PRODUCTVERSION"; FolderID = PREDEFINED_AUTOSTART; FileID = gid_File_Exe_Install_Quickstart; End diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp index 7541e1d2d344..cf9d5ad45e35 100644 --- a/scp2/source/writer/folderitem_writer.scp +++ b/scp2/source/writer/folderitem_writer.scp @@ -29,6 +29,7 @@ FolderItem gid_Folderitem_Swriter Name = "%PRODUCTNAME Writer"; + Name (pt-BR) = "%PRODUCTNAME_BR Writer"; ModuleID = gid_Module_Prg_Wrt_Bin; FolderID = gid_Folder_Staroffice51; FileID = gid_File_Exe_Swriter; diff --git a/set_soenv.in b/set_soenv.in index 0afcc65748e9..6aefd56f9977 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1609,8 +1609,8 @@ else } # Languages ToFile( "WITH_LANG", "@WITH_LANG@", "e" ); -ToFile( "INTRO_BITMAPS", "@INTRO_BITMAPS@", "e" ); -ToFile( "ABOUT_BITMAPS", "@ABOUT_BITMAPS@", "e" ); +ToFile( "INTRO_BITMAP", "@INTRO_BITMAP@", "e" ); +ToFile( "ABOUT_BITMAP", "@ABOUT_BITMAP@", "e" ); ToFile( "OOO_VENDOR", "@OOO_VENDOR@", "e" ); ToFile( "OOODMAKEMODE", "YES", "e" ); ToFile( "WITH_POOR_HELP_LOCALIZATIONS", "@WITH_POOR_HELP_LOCALIZATIONS@", "e" ); diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 88bd80c97f05..3e2745f9ddf7 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=330 -RSCREVISION=330m18(Build:4) -BUILD=4 -LAST_MINOR=m18 +RSCREVISION=330m19(Build:6) +BUILD=6 +LAST_MINOR=m19 SOURCEVERSION=OOO330 |
