diff options
Diffstat (limited to 'scp2')
29 files changed, 190 insertions, 533 deletions
diff --git a/scp2/source/accessories/file_font_accessories.scp b/scp2/source/accessories/file_font_accessories.scp index 2683ed978d4b..9adbe4bdfacf 100644 --- a/scp2/source/accessories/file_font_accessories.scp +++ b/scp2/source/accessories/file_font_accessories.scp @@ -880,22 +880,3 @@ STD_FONT_FILE( gid_File_Fnt_Verina_Serif_Bold, Verina_Serif_Bold.otf, Verina Ser STD_FONT_FILE( gid_File_Fnt_Verina_Serif, Verina_Serif.otf, Verina Serif ) #endif -#ifdef WITH_EXTRA_FONT -STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinum, MagyarLinBiolinum.ttf, Magyar Linux Biolinum) -STD_FONT_FILE( gid_File_Fnt_MagyarLinBiolinumB, MagyarLinBiolinumB.ttf, Magyar Linux Biolinum Bold) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertine, MagyarLinLibertine.ttf, Magyar Linux Libertine) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineB, MagyarLinLibertineB.ttf, Magyar Linux Libertine Bold) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineBI, MagyarLinLibertineBI.ttf, Magyar Linux Libertine Bold Italic) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineC, MagyarLinLibertineC_Re.ttf, Magyar Linux Libertine Capital) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineG, MagyarLinLibertineG.ttf, Magyar Linux Libertine Graphite) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGB, MagyarLinLibertineGB.ttf, Magyar Linux Libertine Bold Graphite) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGBI, MagyarLinLibertineGBI.ttf, Magyar Linux Libertine Bold Italic Graphite) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineGI, MagyarLinLibertineGI.ttf, Magyar Linux Libertine Italic Graphite) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineI, MagyarLinLibertineI.ttf, Magyar Linux Libertine Italic) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineN, MagyarLinLibertineN.ttf, Magyar Linux N Libertine) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNB, MagyarLinLibertineNB.ttf, Magyar Linux Libertine N Bold) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNBI, MagyarLinLibertineNBI.ttf, Magyar Linux Libertine N Bold Italic) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNI, MagyarLinLibertineNI.ttf, Magyar Linux Libertine N Italic) -STD_FONT_FILE( gid_File_Fnt_MagyarLinLibertineNC, MagyarLinLibertineNC_Re.ttf, Magyar Linux Libertine N Capital) -#endif - diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp index 2f6e606ff9c3..c678e7424cd7 100644 --- a/scp2/source/base/folderitem_base.scp +++ b/scp2/source/base/folderitem_base.scp @@ -29,7 +29,6 @@ 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 c32ffa061546..36cd965cb53b 100644 --- a/scp2/source/calc/folderitem_calc.scp +++ b/scp2/source/calc/folderitem_calc.scp @@ -29,7 +29,6 @@ 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 2a302e57ea41..4a73948ced39 100644 --- a/scp2/source/draw/folderitem_draw.scp +++ b/scp2/source/draw/folderitem_draw.scp @@ -29,7 +29,6 @@ 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/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index b8919bcadf87..a2b48ecbac26 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -112,8 +112,8 @@ File gid_File_Oxt_LightProof TXT_FILE_BODY; Styles = (PACKED, ARCHIVE); Dir = gid_Brand_Dir_Share_Extensions_LightProof; - Name (en-US) = "lightproof-en-US-0.1.oxt"; - Name (hu) = "lightproof-hu-1.2.oxt"; + Name (en-US) = "lightproof-en-US.oxt"; + Name (hu) = "lightproof-hu.oxt"; End #endif @@ -295,12 +295,12 @@ File gid_File_Optional_Extensions_Sun_Template_Pack TXT_FILE_BODY; Styles = (PACKED, ARCHIVE); Dir = gid_Brand_Dir_Share_Extensions_Sun_Template_Pack; - Name (en-US) = "Sun_ODF_Template_Pack_en-US.oxt"; - Name (de) = "Sun_ODF_Template_Pack_de.oxt"; - Name (it) = "Sun_ODF_Template_Pack_it.oxt"; - Name (fr) = "Sun_ODF_Template_Pack_fr.oxt"; - Name (es) = "Sun_ODF_Template_Pack_es.oxt"; - Name (hu) = "Sun_ODF_Template_Pack_hu.oxt"; + Name (en-US) = "Sun-ODF-Template-Pack-en-US.oxt"; + Name (de) = "Sun-ODF-Template-Pack-de.oxt"; + Name (it) = "Sun-ODF-Template-Pack-it.oxt"; + Name (fr) = "Sun-ODF-Template-Pack-fr.oxt"; + Name (es) = "Sun-ODF-Template-Pack-es.oxt"; + Name (hu) = "Sun-ODF-Template-Pack-hu.oxt"; End #endif diff --git a/scp2/source/gnome/file_gnome.scp b/scp2/source/gnome/file_gnome.scp index d48915072742..7cfd4556fc1a 100644 --- a/scp2/source/gnome/file_gnome.scp +++ b/scp2/source/gnome/file_gnome.scp @@ -61,3 +61,12 @@ File gid_File_Lib_Gconfbe Name = STRING(CONCAT2(gconfbe1.uno,UNXSUFFIX)); End #endif + +#ifdef ENABLE_SYSTRAY_GTK +File gid_File_Lib_QStart_Gtk + Name = LIBNAME(qstart_gtk); + TXT_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; +End +#endif diff --git a/scp2/source/gnome/makefile.mk b/scp2/source/gnome/makefile.mk index 185915353a5a..581aae447a55 100644 --- a/scp2/source/gnome/makefile.mk +++ b/scp2/source/gnome/makefile.mk @@ -39,6 +39,10 @@ TARGETTYPE=CUI SCP_PRODUCT_TYPE=osl +.IF "$(ENABLE_SYSTRAY_GTK)" != "" +SCPDEFS+=-DENABLE_SYSTRAY_GTK +.ENDIF + .IF "$(ENABLE_GCONF)"!="" || "$(ENABLE_GNOMEVFS)"!="" || "$(ENABLE_GIO)"!="" .IF "$(ENABLE_GCONF)" != "" diff --git a/scp2/source/gnome/module_gnome.scp b/scp2/source/gnome/module_gnome.scp index f9df5c8969a1..5572a26a64ef 100644 --- a/scp2/source/gnome/module_gnome.scp +++ b/scp2/source/gnome/module_gnome.scp @@ -41,6 +41,14 @@ Module gid_Module_Optional_Gnome XpdCheckSolaris = "SUNWgnome-vfs"; #endif Files = ( + gid_File_Lib_Evoab_2, + gid_File_Lib_Fps_Gnome, + gid_File_Lib_Vclplug_Gtk, + gid_File_Bin_Gnome_Open_Url, + gid_File_Bin_Gnome_Open_Url_Bin, +#ifdef ENABLE_SYSTRAY_GTK + gid_File_Lib_QStart_Gtk, +#endif #ifdef ENABLE_GNOMEVFS gid_File_Lib_Gnomevfs, gid_File_Bin_Gnome_Set_Default_Application, #endif diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp index e9a0708331b5..db7b0c3794dd 100644 --- a/scp2/source/impress/folderitem_impress.scp +++ b/scp2/source/impress/folderitem_impress.scp @@ -29,7 +29,6 @@ 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/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp index e204e04417bd..300deca7aa34 100644 --- a/scp2/source/impress/module_ogltrans.scp +++ b/scp2/source/impress/module_ogltrans.scp @@ -41,11 +41,7 @@ File gid_File_Lib_OpenGLTransitions Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; #ifdef UNX - #ifdef QUARTZ - Name = STRING(CONCAT2(libOGLTrans.uno,UNXSUFFIX)); - #else Name = STRING(CONCAT2(OGLTrans.uno,UNXSUFFIX)); - #endif #else Name = "OGLTrans.uno.dll"; #endif diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp index 49f1b8cb8a4b..2decfb20811c 100644 --- a/scp2/source/math/folderitem_math.scp +++ b/scp2/source/math/folderitem_math.scp @@ -29,7 +29,6 @@ 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/common_brand.scp b/scp2/source/ooo/common_brand.scp index 5f34ebc8d810..3a72af6a4b77 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -570,22 +570,6 @@ File gid_Brand_File_Bin_Unopkgexe End #endif -#ifdef WNT -File gid_Brand_File_Bin_Rebaseoo - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); - Name = "rebaseoo.exe"; -End - -File gid_Brand_File_Bin_Rebasegui - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); - Name = "rebasegui.exe"; -End -#endif - #if defined UNX && !defined MACOSX File gid_Brand_File_Script_Unopkg BIN_FILE_BODY; @@ -793,23 +777,6 @@ File gid_Brand_File_Lib_Mingwm10 End #endif -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_Brand_File_Lib_Msvcr80 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; -#ifndef _DEBUG_RUNTIME - Name = "msvcr80.dll"; -#else - Name = "msvcr80d.dll"; -#endif -End -#endif -#endif -#endif - #if defined(WNT) && defined( _gcc3 ) #if defined(MINGW_GCCDLL) @@ -836,57 +803,6 @@ End #endif -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_Brand_File_Lib_Msvcp80 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; -#ifndef _DEBUG_RUNTIME - Name = "msvcp80.dll"; -#else - Name = "msvcp80d.dll"; -#endif -End -#endif -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_Brand_File_Lib_Msvcm80 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; -#ifndef _DEBUG_RUNTIME - Name = "msvcm80.dll"; -#else - Name = "msvcm80d.dll"; -#endif -End -#endif -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_Brand_File_Msvcm80crt_Manifest - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Program; -#ifndef _DEBUG_RUNTIME - Name = "Microsoft.VC80.CRT.manifest"; -#else - Name = "Microsoft.VC80.DebugCRT.manifest"; -#endif -End -#endif -#endif -#endif - // Profiles Profile gid_Brand_Profile_Bootstrap_Ini diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 3807bde88938..7860835c21a9 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -1196,11 +1196,6 @@ Directory gid_Dir_Wordbook DosName = "wordbook"; End -Directory gid_Dir_Wordbook_Language - ParentID = gid_Dir_Wordbook; - DIR_ISOLANGUAGE_ALL_LANG_2; -End - Directory gid_Dir_Share_Plugin ParentID = gid_Dir_Share; DosName = "plugin"; diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 7cf102c91cd8..1beec8aad249 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -416,15 +416,8 @@ File gid_File_Extra_Webcast_Pl End File gid_File_Extra_Wordbook - Dir = gid_Dir_Wordbook_Language; + Dir = gid_Dir_Wordbook; TXT_FILE_BODY; Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_IDENT_ALL_LANG(wordbook.zip); -End - -File gid_File_Extra_Wordbook_Lang - Dir = gid_Dir_Wordbook_Language; - TXT_FILE_BODY; - Styles = (ARCHIVE, DONT_OVERWRITE); - EXTRA_ALL_LANG(wordbook,zip); + Name = "wordbook.zip"; End diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 95c7ea2c20a1..bbca5d19a91e 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -112,9 +112,7 @@ File gid_File_Lib_Cli_Oootypes_Assembly Version = "${CLI_OOOTYPES_NEW_VERSION}"; Culture = "neutral"; Attributes = "0"; -#ifndef M1310 ProcessorArchitecture = "MSIL"; -#endif End #endif @@ -130,9 +128,7 @@ File gid_File_Lib_Policy_Cli_Oootypes_Assembly Version = "${CLI_OOOTYPES_POLICY_VERSION}"; Culture = "neutral"; Attributes = "0"; -#ifndef M1310 ProcessorArchitecture = "MSIL"; -#endif End #endif @@ -914,6 +910,12 @@ STD_LIB_FILE(gid_File_Lib_Wlwp,lwpft) STD_LIB_FILE(gid_File_Lib_Writerfilter,writerfilter) +STD_LIB_FILE(gid_File_Lib_Resource,resourcemodel) + +STD_LIB_FILE(gid_File_Lib_Doctok,doctok) + +STD_LIB_FILE(gid_File_Lib_ooxml,ooxml) + #ifdef WNT #if defined(_gcc3) @@ -927,57 +929,6 @@ End #endif #endif -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_File_Lib_Msvcr80 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Program; -#ifndef _DEBUG_RUNTIME - Name = "msvcr80.dll"; -#else - Name = "msvcr80d.dll"; -#endif -End -#endif -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_File_Lib_Msvcp80 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Program; -#ifndef _DEBUG_RUNTIME - Name = "msvcp80.dll"; -#else - Name = "msvcp80d.dll"; -#endif -End -#endif -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_File_Lib_Msvcm80 - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Program; -#ifndef _DEBUG_RUNTIME - Name = "msvcm80.dll"; -#else - Name = "msvcm80d.dll"; -#endif -End -#endif -#endif -#endif - #if defined(WNT) && defined( _gcc3 ) #if defined(MINGW_GCCDLL) @@ -1004,23 +955,6 @@ End #endif -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_File_Msvcm80crt_Manifest - BIN_FILE_BODY; - Styles = (PACKED); - Dir = gid_Dir_Program; -#ifndef _DEBUG_RUNTIME - Name = "Microsoft.VC80.CRT.manifest"; -#else - Name = "Microsoft.VC80.DebugCRT.manifest"; -#endif -End -#endif -#endif -#endif - STD_LIB_FILE(gid_File_Lib_Mysql,mysql) STD_LIB_FILE(gid_File_Lib_Odbc,odbc) @@ -1500,7 +1434,6 @@ STD_LIB_FILE( gid_File_Lib_Xsltdlg, xsltdlg ) STD_LIB_FILE( gid_File_Lib_Xsltfilter, xsltfilter ) STD_LIB_FILE( gid_File_Lib_Xmlfa, xmlfa ) STD_LIB_FILE( gid_File_Lib_Xmlfd, xmlfd ) -STD_LIB_FILE( gid_File_Lib_Odfflatxml, odfflatxml ) #ifdef SOLAR_JAVA STD_JAR_FILE( gid_File_Jar_Xsltfilter, XSLTFilter ) @@ -1698,8 +1631,7 @@ End STD_LIB_FILE( gid_File_Lib_Oooimprovecore , oooimprovecore) -#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA && \ - !(defined M1400 && defined PROF_EDITION && !defined _DEBUG_RUNTIME) +#if defined WNT && !defined _gcc3 && !defined SYSTEM_MOZILLA && !defined WITHOUT_MOZILLA // see common_brand.scp gid_Brand_File_Lib_Msvcp80 and // gid_Brand_File_Lib_Msvcr80 File gid_File_Moz_Msvcp80 diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 277308160d3f..bd291fb786e2 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -108,17 +108,6 @@ File gid_File_Basic_Tutorials Name = "basicsrvtutorials.zip"; End -#if defined UNX && ! defined MACOSX - -File gid_File_Bin_Pagein - BIN_FILE_BODY; - Dir = gid_Dir_Program; - Styles = (PACKED); - Name = "pagein"; -End - -#endif - #ifndef WITHOUT_MOZILLA #if !defined(UNX) || defined(ENABLE_GTK) @@ -1749,21 +1738,6 @@ File gid_File_Config_Javasettingsunopkginstall #endif End -#if defined( BUILD_SPECIAL ) -#if !defined( MACOSX ) -File gid_File_Stclient_Wrapper - Dir = gid_Dir_Program; - BIN_FILE_BODY; -#if defined ( WNT ) - Name = "stclient_wrapper.exe"; -#else - Name = "stclient_wrapper"; -#endif - Styles = (); -End -#endif -#endif - #ifdef ENABLE_SVCTAGS File gid_File_Jar_Productregistration TXT_FILE_BODY; diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp index db3e5b1679c9..b6ef81eff36d 100644 --- a/scp2/source/ooo/folderitem_ooo.scp +++ b/scp2/source/ooo/folderitem_ooo.scp @@ -29,7 +29,6 @@ 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; @@ -43,7 +42,6 @@ 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/installation_ooo.scp b/scp2/source/ooo/installation_ooo.scp index b99fc2caa23f..26bdc09eddd3 100644 --- a/scp2/source/ooo/installation_ooo.scp +++ b/scp2/source/ooo/installation_ooo.scp @@ -29,7 +29,6 @@ Installation gid_Installation_Ooo ProductName = "${PRODUCTNAME}"; - ProductName_Br = "${PRODUCTNAME_BR}"; ProductVersion = "${PRODUCTVERSION}"; ProductExtension = "${PRODUCTEXTENSION}"; OOoBaseVersion = "${OOOBASEVERSION}"; diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index db402e7278ce..4dba9553e8b0 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -68,10 +68,6 @@ SCPDEFS+=-DGTK_TWO_FOUR .ENDIF .ENDIF # "$(GUI)"=="UNX" -.IF "$(ENABLE_SYSTRAY_GTK)" != "" -SCPDEFS+=-DENABLE_SYSTRAY_GTK -.ENDIF - .IF "$(ENABLE_KDE)" != "" SCPDEFS+=-DENABLE_KDE .ENDIF diff --git a/scp2/source/ooo/mergemodules_ooo.scp b/scp2/source/ooo/mergemodules_ooo.scp deleted file mode 100644 index b19ca8c47bba..000000000000 --- a/scp2/source/ooo/mergemodules_ooo.scp +++ /dev/null @@ -1,56 +0,0 @@ -/************************************************************************* -* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org 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 version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * -************************************************************************/ - -#include "macros.inc" - -#ifdef M1500 -MergeModule gid_Mergemodule_Microsoft_Vc90_Crt_X86 -#ifdef _DEBUG_RUNTIME - Name = "Microsoft_VC90_DebugCRT_x86.msm"; -#else - Name = "Microsoft_VC90_CRT_x86.msm"; -#endif - Cabfilename = "openoffice.org-vc90crt.cab"; - Feature = "gm_Root"; - RootDir = "TARGETDIR"; - Styles = (REMOVE_FILE_TABLE); -End -#endif - -#ifdef M1500 -MergeModule gid_Mergemodule_Policy_Microsoft_Vc90_Crt_X86 -#ifdef _DEBUG_RUNTIME - Name = "policy_9_0_Microsoft_VC90_DebugCRT_x86.msm"; -#else - Name = "policy_9_0_Microsoft_VC90_CRT_x86.msm"; -#endif - Cabfilename = "openoffice.org-policy-vc90crt.cab"; - Feature = "gm_Root"; - RootDir = "TARGETDIR"; - Styles = (REMOVE_FILE_TABLE); -End -#endif diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 3253f0099cc6..d2d46cd9f1e0 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -83,8 +83,6 @@ Module gid_Module_Root_Files_2 Default = YES; Styles = (HIDDEN_ROOT); Files = (gid_File_Bin_Cde_Open_Url, - gid_File_Bin_Gnome_Open_Url, - gid_File_Bin_Gnome_Open_Url_Bin, gid_File_Bin_Kde_Open_Url, gid_File_Bin_Open_Url, gid_File_Bin_Pagein, @@ -279,7 +277,6 @@ Module gid_Module_Root_Files_4 gid_File_Lib_Odfflatxml, gid_File_Lib_Zip, gid_File_Lib_Vclplug_Gen, - gid_File_Lib_Vclplug_Gtk, gid_File_Lib_Vclplug_Kde, gid_File_Lib_Vclplug_Kde4, gid_File_Lib_Vclplug_Svp, @@ -352,7 +349,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Dbpool, gid_File_Lib_Embobj, gid_File_Lib_Emboleobj, - gid_File_Lib_Evoab_2, gid_File_Lib_Kab_1, gid_File_Lib_Kab_Drv_1, gid_File_Lib_Macab_1, @@ -360,7 +356,6 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Evtatt, gid_File_Lib_Fileacc, gid_File_Lib_Filterconfig1, - gid_File_Lib_Fps_Gnome, gid_File_Lib_Dbodbcbase, gid_File_Lib_I18npool, gid_File_Lib_I18npaper, @@ -700,6 +695,7 @@ Module gid_Module_Root_Files_6 gid_File_Share_Registry_Main_Xcd, gid_File_Share_Registry_Forcedefault_Xcd, gid_File_Pymailmerge, + gid_File_Pymailmerge_msgbox, gid_File_Xsl_Common_Measure_Conversion, gid_File_Xsl_Common_Math_Functions, gid_File_Xsl_Export_Common_Body, diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 6825ed26b81e..f801a6201dc6 100644 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -37,8 +37,6 @@ Module gid_Module_Langpack_Basis_Template gid_File_Extra_Tplwizfax_Lang, gid_File_Extra_Tplwizreport_Lang, gid_File_Extra_Tplwizstyles_Lang, - gid_File_Extra_Wordbook, - gid_File_Extra_Wordbook_Lang, gid_File_Registry_Filter_Zip, gid_File_Registry_Lang, gid_File_Registry_Spool_Langpack_Lang, diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index a8d2316357a1..7e1f9e6e8d3e 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -26,250 +26,250 @@ ************************************************************************/ [STR_NAME_MODULE_ROOT_LANGPACK] -en-US = "Additional language packs" +en-US = "Additional user interface languages" [STR_DESC_MODULE_ROOT_LANGPACK] -en-US = "Additional language packs" +en-US = "Additional user interface languages" [STR_NAME_MODULE_LANGPACK_EN_US] en-US = "English" [STR_DESC_MODULE_LANGPACK_EN_US] -en-US = "Installs English support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the English user interface" [STR_NAME_MODULE_LANGPACK_DE] en-US = "German" [STR_DESC_MODULE_LANGPACK_DE] -en-US = "Installs German support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the German user interface" [STR_NAME_MODULE_LANGPACK_FR] en-US = "French" [STR_DESC_MODULE_LANGPACK_FR] -en-US = "Installs French support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the French user interface" [STR_NAME_MODULE_LANGPACK_IT] en-US = "Italian" [STR_DESC_MODULE_LANGPACK_IT] -en-US = "Installs Italian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Italian user interface" [STR_NAME_MODULE_LANGPACK_ES] en-US = "Spanish" [STR_DESC_MODULE_LANGPACK_ES] -en-US = "Installs Spanish support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Spanish user interface" [STR_NAME_MODULE_LANGPACK_SV] en-US = "Swedish" [STR_DESC_MODULE_LANGPACK_SV] -en-US = "Installs Swedish support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Swedish user interface" [STR_NAME_MODULE_LANGPACK_PT] en-US = "Portuguese" [STR_DESC_MODULE_LANGPACK_PT] -en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Portuguese user interface" [STR_NAME_MODULE_LANGPACK_PT_BR] en-US = "Portuguese (Brazil)" [STR_DESC_MODULE_LANGPACK_PT_BR] -en-US = "Installs Portuguese support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Portuguese user interface" [STR_NAME_MODULE_LANGPACK_JA] en-US = "Japanese" [STR_DESC_MODULE_LANGPACK_JA] -en-US = "Installs Japanese support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Japanese user interface" [STR_NAME_MODULE_LANGPACK_KO] en-US = "Korean" [STR_DESC_MODULE_LANGPACK_KO] -en-US = "Installs Korean support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Korean user interface" [STR_NAME_MODULE_LANGPACK_ZH_CN] en-US = "Chinese (simplified)" [STR_DESC_MODULE_LANGPACK_ZH_CN] -en-US = "Installs Chinese (simplified) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Chinese (simplified) user interface" [STR_NAME_MODULE_LANGPACK_ZH_TW] en-US = "Chinese (traditional)" [STR_DESC_MODULE_LANGPACK_ZH_TW] -en-US = "Installs Chinese (traditional) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Chinese (traditional) user interface" [STR_NAME_MODULE_LANGPACK_NL] en-US = "Dutch" [STR_DESC_MODULE_LANGPACK_NL] -en-US = "Installs Dutch support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Dutch user interface" [STR_NAME_MODULE_LANGPACK_HU] en-US = "Hungarian" [STR_DESC_MODULE_LANGPACK_HU] -en-US = "Installs Hungarian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Hungarian user interface" [STR_NAME_MODULE_LANGPACK_PL] en-US = "Polish" [STR_DESC_MODULE_LANGPACK_PL] -en-US = "Installs Polish support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Polish user interface" [STR_NAME_MODULE_LANGPACK_RU] en-US = "Russian" [STR_DESC_MODULE_LANGPACK_RU] -en-US = "Installs Russian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Russian user interface" [STR_NAME_MODULE_LANGPACK_TR] en-US = "Turkish" [STR_DESC_MODULE_LANGPACK_TR] -en-US = "Installs Turkish support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Turkish user interface" [STR_NAME_MODULE_LANGPACK_EL] en-US = "Greek" [STR_DESC_MODULE_LANGPACK_EL] -en-US = "Installs Greek support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Greek user interface" [STR_NAME_MODULE_LANGPACK_TH] en-US = "Thai" [STR_DESC_MODULE_LANGPACK_TH] -en-US = "Installs Thai support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Thai user interface" [STR_NAME_MODULE_LANGPACK_CS] en-US = "Czech" [STR_DESC_MODULE_LANGPACK_CS] -en-US = "Installs Czech support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Czech user interface" [STR_NAME_MODULE_LANGPACK_SK] en-US = "Slovak" [STR_DESC_MODULE_LANGPACK_SK] -en-US = "Installs Slovak support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Slovak user interface" [STR_NAME_MODULE_LANGPACK_HR] en-US = "Croatian" [STR_DESC_MODULE_LANGPACK_HR] -en-US = "Installs Croatian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Croatian user interface" [STR_NAME_MODULE_LANGPACK_ET] en-US = "Estonian" [STR_DESC_MODULE_LANGPACK_ET] -en-US = "Installs Estonian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Estonian user interface" [STR_NAME_MODULE_LANGPACK_VI] en-US = "Vietnamese" [STR_DESC_MODULE_LANGPACK_VI] -en-US = "Installs Vietnamese support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Vietnamese user interface" [STR_NAME_MODULE_LANGPACK_BG] en-US = "Bulgarian" [STR_DESC_MODULE_LANGPACK_BG] -en-US = "Installs Bulgarian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Bulgarian user interface" [STR_NAME_MODULE_LANGPACK_KM] en-US = "Khmer" [STR_DESC_MODULE_LANGPACK_KM] -en-US = "Installs Khmer support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Khmer user interface" [STR_NAME_MODULE_LANGPACK_PA_IN] en-US = "Punjabi" [STR_DESC_MODULE_LANGPACK_PA_IN] -en-US = "Installs Punjabi support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Punjabi user interface" [STR_NAME_MODULE_LANGPACK_GU_IN] en-US = "Gujarati" [STR_DESC_MODULE_LANGPACK_GU_IN] -en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Gujarati user interface" [STR_NAME_MODULE_LANGPACK_TA] en-US = "Tamil" [STR_DESC_MODULE_LANGPACK_TA] -en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Tamil user interface" [STR_NAME_MODULE_LANGPACK_TA_IN] en-US = "Tamil" [STR_DESC_MODULE_LANGPACK_TA_IN] -en-US = "Installs Tamil support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Tamil user interface" [STR_NAME_MODULE_LANGPACK_HI] en-US = "Hindi" [STR_DESC_MODULE_LANGPACK_HI] -en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Hindi user interface" [STR_NAME_MODULE_LANGPACK_HI_IN] en-US = "Hindi" [STR_DESC_MODULE_LANGPACK_HI_IN] -en-US = "Installs Hindi support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Hindi user interface" [STR_NAME_MODULE_LANGPACK_ST] en-US = "Southern Sotho (Sutu)" [STR_DESC_MODULE_LANGPACK_ST] -en-US = "Installs Southern Sotho (Sutu) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Southern Sotho (Sutu) user interface" [STR_NAME_MODULE_LANGPACK_TN] en-US = "Tswana" [STR_DESC_MODULE_LANGPACK_TN] -en-US = "Installs Tswana support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Tswana user interface" [STR_NAME_MODULE_LANGPACK_XH] en-US = "Xhosa" [STR_DESC_MODULE_LANGPACK_XH] -en-US = "Installs Xhosa support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Xhosa user interface" [STR_NAME_MODULE_LANGPACK_ZU] en-US = "Zulu" [STR_DESC_MODULE_LANGPACK_ZU] -en-US = "Installs Zulu support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Zulu user interface" [STR_NAME_MODULE_LANGPACK_AF] en-US = "Afrikaans" [STR_DESC_MODULE_LANGPACK_AF] -en-US = "Installs Afrikaans support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Afrikaans user interface" [STR_NAME_MODULE_LANGPACK_SW] en-US = "Swahili" [STR_DESC_MODULE_LANGPACK_SW] -en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Swahili user interface" [STR_NAME_MODULE_LANGPACK_SW_TZ] en-US = "Swahili" [STR_DESC_MODULE_LANGPACK_SW_TZ] -en-US = "Installs Swahili support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Swahili user interface" [STR_NAME_MODULE_LANGPACK_LO] en-US = "Lao" [STR_DESC_MODULE_LANGPACK_LO] -en-US = "Installs Lao support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Lao user interface" [STR_NAME_MODULE_LANGPACK_MY] en-US = "Burmese" @@ -281,568 +281,568 @@ en-US = "Installs the Burmese (Myanmar) user interface" en-US = "Northern Sotho" [STR_DESC_MODULE_LANGPACK_NSO] -en-US = "Installs Northern Sotho support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Northern Sotho user interface" [STR_NAME_MODULE_LANGPACK_BN] en-US = "Bengali" [STR_DESC_MODULE_LANGPACK_BN] -en-US = "Installs Bengali support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Bengali user interface" [STR_NAME_MODULE_LANGPACK_BN_BD] en-US = "Bengali (Bangladesh)" [STR_DESC_MODULE_LANGPACK_BN_BD] -en-US = "Installs Bengali (Bangladesh) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Bengali (Bangladesh) user interface" [STR_NAME_MODULE_LANGPACK_BN_IN] en-US = "Bengali (India)" [STR_DESC_MODULE_LANGPACK_BN_IN] -en-US = "Installs Bengali (India) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Bengali (India) user interface" [STR_NAME_MODULE_LANGPACK_OR] en-US = "Oriya" [STR_DESC_MODULE_LANGPACK_OR] -en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Oriya user interface" [STR_NAME_MODULE_LANGPACK_OR_IN] en-US = "Oriya" [STR_DESC_MODULE_LANGPACK_OR_IN] -en-US = "Installs Oriya support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Oriya user interface" [STR_NAME_MODULE_LANGPACK_MR] en-US = "Marathi" [STR_DESC_MODULE_LANGPACK_MR] -en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Marathi user interface" [STR_NAME_MODULE_LANGPACK_MR_IN] en-US = "Marathi" [STR_DESC_MODULE_LANGPACK_MR_IN] -en-US = "Installs Marathi support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Marathi user interface" [STR_NAME_MODULE_LANGPACK_NE] en-US = "Nepali" [STR_DESC_MODULE_LANGPACK_NE] -en-US = "Installs Nepali support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Nepali user interface" [STR_NAME_MODULE_LANGPACK_AR] en-US = "Arabic" [STR_DESC_MODULE_LANGPACK_AR] -en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Arabic user interface" [STR_NAME_MODULE_LANGPACK_AR_SA] en-US = "Arabic" [STR_DESC_MODULE_LANGPACK_AR_SA] -en-US = "Installs Arabic support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Arabic user interface" [STR_NAME_MODULE_LANGPACK_CA] en-US = "Catalan" [STR_DESC_MODULE_LANGPACK_CA] -en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Catalan user interface" [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" +en-US = "Installs the Catalan (Valencian) user interface" [STR_NAME_MODULE_LANGPACK_DA] en-US = "Danish" [STR_DESC_MODULE_LANGPACK_DA] -en-US = "Installs Danish support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Danish user interface" [STR_NAME_MODULE_LANGPACK_FI] en-US = "Finnish" [STR_DESC_MODULE_LANGPACK_FI] -en-US = "Installs Finnish support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Finnish user interface" [STR_NAME_MODULE_LANGPACK_HE] en-US = "Hebrew" [STR_DESC_MODULE_LANGPACK_HE] -en-US = "Installs Hebrew support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Hebrew user interface" [STR_NAME_MODULE_LANGPACK_IS] en-US = "Icelandic" [STR_DESC_MODULE_LANGPACK_IS] -en-US = "Installs Icelandic support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Icelandic user interface" [STR_NAME_MODULE_LANGPACK_NB] en-US = "Norwegian (Bokmål)" [STR_DESC_MODULE_LANGPACK_NB] -en-US = "Installs Norwegian (Bokmål) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Norwegian (Bokmål) user interface" [STR_NAME_MODULE_LANGPACK_NN] en-US = "Norwegian (Nynorsk)" [STR_DESC_MODULE_LANGPACK_NN] -en-US = "Installs Norwegian (Nynorsk) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Norwegian (Nynorsk) user interface" [STR_NAME_MODULE_LANGPACK_RM] en-US = "Rhaeto-Romance" [STR_DESC_MODULE_LANGPACK_RM] -en-US = "Installs Rhaeto-Romance support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Rhaeto-Romance user interface" [STR_NAME_MODULE_LANGPACK_RO] en-US = "Romanian" [STR_DESC_MODULE_LANGPACK_RO] -en-US = "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Romanian user interface" [STR_NAME_MODULE_LANGPACK_SQ] en-US = "Albanian" [STR_DESC_MODULE_LANGPACK_SQ] -en-US = "Installs Albanian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Albanian user interface" [STR_NAME_MODULE_LANGPACK_UR] en-US = "Urdu" [STR_DESC_MODULE_LANGPACK_UR] -en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Urdu user interface" [STR_NAME_MODULE_LANGPACK_ID] en-US = "Indonesian" [STR_DESC_MODULE_LANGPACK_ID] -en-US = "Installs Indonesian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Indonesian user interface" [STR_NAME_MODULE_LANGPACK_UK] en-US = "Ukrainian" [STR_DESC_MODULE_LANGPACK_UK] -en-US = "Installs Ukrainian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Ukrainian user interface" [STR_NAME_MODULE_LANGPACK_BE] en-US = "Belarusian" [STR_DESC_MODULE_LANGPACK_BE] -en-US = "Installs Belarusian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Belarusian user interface" [STR_NAME_MODULE_LANGPACK_SL] en-US = "Slovenian" [STR_DESC_MODULE_LANGPACK_SL] -en-US = "Installs Slovenian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Slovenian user interface" [STR_NAME_MODULE_LANGPACK_LV] en-US = "Latvian" [STR_DESC_MODULE_LANGPACK_LV] -en-US = "Installs Latvian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Latvian user interface" [STR_NAME_MODULE_LANGPACK_LT] en-US = "Lithuanian" [STR_DESC_MODULE_LANGPACK_LT] -en-US = "Installs Lithuanian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Lithuanian user interface" [STR_NAME_MODULE_LANGPACK_HY] en-US = "Armenian" [STR_DESC_MODULE_LANGPACK_HY] -en-US = "Installs Armenian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Armenian user interface" [STR_NAME_MODULE_LANGPACK_EU] en-US = "Basque" [STR_DESC_MODULE_LANGPACK_EU] -en-US = "Installs Basque support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Basque user interface" [STR_NAME_MODULE_LANGPACK_MK] en-US = "Macedonian" [STR_DESC_MODULE_LANGPACK_MK] -en-US = "Installs Macedonian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Macedonian user interface" [STR_NAME_MODULE_LANGPACK_MT] en-US = "Maltese" [STR_DESC_MODULE_LANGPACK_MT] -en-US = "Installs Maltese support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Maltese user interface" [STR_NAME_MODULE_LANGPACK_CY] en-US = "Welsh" [STR_DESC_MODULE_LANGPACK_CY] -en-US = "Installs Welsh support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Welsh user interface" [STR_NAME_MODULE_LANGPACK_GL] en-US = "Galician" [STR_DESC_MODULE_LANGPACK_GL] -en-US = "Installs Galician support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Galician user interface" [STR_NAME_MODULE_LANGPACK_SH_YU] en-US = "Serbian (Latin)" [STR_DESC_MODULE_LANGPACK_SH_YU] -en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Serbian (Latin) user interface" [STR_NAME_MODULE_LANGPACK_SH] en-US = "Serbian (Latin)" [STR_DESC_MODULE_LANGPACK_SH] -en-US = "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Serbian (Latin) user interface" [STR_NAME_MODULE_LANGPACK_GA] en-US = "Irish" [STR_DESC_MODULE_LANGPACK_GA] -en-US = "Installs Irish support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Irish user interface" [STR_NAME_MODULE_LANGPACK_SR_CS] en-US = "Serbian (Cyrillic)" [STR_DESC_MODULE_LANGPACK_SR_CS] -en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Serbian (Cyrillic) user interface" [STR_NAME_MODULE_LANGPACK_SR] en-US = "Serbian (Cyrillic)" [STR_DESC_MODULE_LANGPACK_SR] -en-US = "Installs Serbian (Cyrillic) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Serbian (Cyrillic) user interface" [STR_NAME_MODULE_LANGPACK_BS] en-US = "Bosnian" [STR_DESC_MODULE_LANGPACK_BS] -en-US = "Installs Bosnian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Bosnian user interface" [STR_NAME_MODULE_LANGPACK_AS_IN] en-US = "Assamese" [STR_DESC_MODULE_LANGPACK_AS_IN] -en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Assamese user interface" [STR_NAME_MODULE_LANGPACK_AST] en-US = "Asturian" [STR_DESC_MODULE_LANGPACK_AST] -en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Asturian user interface" [STR_NAME_MODULE_LANGPACK_RW] en-US = "Kinyarwanda" [STR_DESC_MODULE_LANGPACK_RW] -en-US = "Installs Kinyarwanda support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Kinyarwanda user interface" [STR_NAME_MODULE_LANGPACK_SA] en-US = "Sanskrit" [STR_DESC_MODULE_LANGPACK_SA] -en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Sanskrit user interface" [STR_NAME_MODULE_LANGPACK_FA] en-US = "Farsi" [STR_DESC_MODULE_LANGPACK_FA] -en-US = "Installs Farsi support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Farsi user interface" [STR_NAME_MODULE_LANGPACK_FO] en-US = "Faroese" [STR_DESC_MODULE_LANGPACK_FO] -en-US = "Installs Faroese support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Faroese user interface" [STR_NAME_MODULE_LANGPACK_SB] en-US = "Sorbian" [STR_DESC_MODULE_LANGPACK_SB] -en-US = "Installs Sorbian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Sorbian user interface" [STR_NAME_MODULE_LANGPACK_TT] en-US = "Tatar" [STR_DESC_MODULE_LANGPACK_TT] -en-US = "Installs Tatar support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Tatar user interface" [STR_NAME_MODULE_LANGPACK_TS] en-US = "Tsonga" [STR_DESC_MODULE_LANGPACK_TS] -en-US = "Installs Tsonga support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Tsonga user interface" [STR_NAME_MODULE_LANGPACK_YI] en-US = "Yiddish" [STR_DESC_MODULE_LANGPACK_YI] -en-US = "Installs Yiddish support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Yiddish user interface" [STR_NAME_MODULE_LANGPACK_BR] en-US = "Breton" [STR_DESC_MODULE_LANGPACK_BR] -en-US = "Installs Breton support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Breton user interface" [STR_NAME_MODULE_LANGPACK_NR] en-US = "Ndebele South" [STR_DESC_MODULE_LANGPACK_NR] -en-US = "Installs Ndebele South support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Ndebele South user interface" [STR_NAME_MODULE_LANGPACK_SS] en-US = "Swazi" [STR_DESC_MODULE_LANGPACK_SS] -en-US = "Installs Swazi support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Swazi user interface" [STR_NAME_MODULE_LANGPACK_VE] en-US = "Venda" [STR_DESC_MODULE_LANGPACK_VE] -en-US = "Installs Venda support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Venda user interface" [STR_NAME_MODULE_LANGPACK_KN] en-US = "Kannada" [STR_DESC_MODULE_LANGPACK_KN] -en-US = "Installs Kannada support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Kannada user interface" [STR_NAME_MODULE_LANGPACK_MS] en-US = "Malay (Malaysian)" [STR_DESC_MODULE_LANGPACK_MS] -en-US = "Installs Malay (Malaysian) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Malay (Malaysian) user interface" [STR_NAME_MODULE_LANGPACK_TG] en-US = "Tajik" [STR_DESC_MODULE_LANGPACK_TG] -en-US = "Installs Tajik support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Tajik user interface" [STR_NAME_MODULE_LANGPACK_KU] en-US = "Kurdish" [STR_DESC_MODULE_LANGPACK_KU] -en-US = "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Kurdish user interface" [STR_NAME_MODULE_LANGPACK_DZ] en-US = "Dzongkha" [STR_DESC_MODULE_LANGPACK_DZ] -en-US = "Installs Dzongkha support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Dzongkha user interface" [STR_NAME_MODULE_LANGPACK_KA] en-US = "Georgian" [STR_DESC_MODULE_LANGPACK_KA] -en-US = "Installs Georgian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Georgian user interface" [STR_NAME_MODULE_LANGPACK_EO] en-US = "Esperanto" [STR_DESC_MODULE_LANGPACK_EO] -en-US = "Installs Esperanto support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Esperanto user interface" [STR_NAME_MODULE_LANGPACK_GU] en-US = "Gujarati" [STR_DESC_MODULE_LANGPACK_GU] -en-US = "Installs Gujarati support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Gujarati user interface" [STR_NAME_MODULE_LANGPACK_EN_ZA] en-US = "English (South Africa)" [STR_DESC_MODULE_LANGPACK_EN_ZA] -en-US = "Installs English (South Africa) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the English (South Africa) user interface" [STR_NAME_MODULE_LANGPACK_EN_GB] en-US = "English (United Kingdom)" [STR_DESC_MODULE_LANGPACK_EN_GB] -en-US = "Installs English (United Kingdom) support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the English (United Kingdom) user interface" [STR_NAME_MODULE_LANGPACK_UR_IN] en-US = "Urdu" [STR_DESC_MODULE_LANGPACK_UR_IN] -en-US = "Installs Urdu support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Urdu user interface" [STR_NAME_MODULE_LANGPACK_ML_IN] en-US = "Malayalam" [STR_DESC_MODULE_LANGPACK_ML_IN] -en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Malayalam user interface" [STR_NAME_MODULE_LANGPACK_TE_IN] en-US = "Telugu" [STR_DESC_MODULE_LANGPACK_TE_IN] -en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Telugu user interface" [STR_NAME_MODULE_LANGPACK_TI_ER] en-US = "Tigrinya" [STR_DESC_MODULE_LANGPACK_TI_ER] -en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Tigrinya user interface" [STR_NAME_MODULE_LANGPACK_UZ] en-US = "Uzbek" [STR_DESC_MODULE_LANGPACK_UZ] -en-US = "Installs Uzbek support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Uzbek user interface" [STR_NAME_MODULE_LANGPACK_MN] en-US = "Mongolian" [STR_DESC_MODULE_LANGPACK_MN] -en-US = "Installs Mongolian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Mongolian user interface" [STR_NAME_MODULE_LANGPACK_BO] en-US = "Tibetan" [STR_DESC_MODULE_LANGPACK_BO] -en-US = "Installs Tibetan support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Tibetan user interface" [STR_NAME_MODULE_LANGPACK_OC] en-US = "Occitan" [STR_DESC_MODULE_LANGPACK_OC] -en-US = "Installs Occitan support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Occitan user interface" [STR_NAME_MODULE_LANGPACK_OM] en-US = "Oromo" [STR_DESC_MODULE_LANGPACK_OM] -en-US = "Installs Oromo support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Oromo user interface" [STR_NAME_MODULE_LANGPACK_SI] en-US = "Sinhala" [STR_DESC_MODULE_LANGPACK_SI] -en-US = "Installs Sinhala support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Sinhala user interface" [STR_NAME_MODULE_LANGPACK_UG] en-US = "Uyghur" [STR_DESC_MODULE_LANGPACK_UG] -en-US = "Installs Uyghur support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Uyghur user interface" [STR_NAME_MODULE_LANGPACK_AS] en-US = "Assamese" [STR_DESC_MODULE_LANGPACK_AS] -en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Assamese user interface" [STR_NAME_MODULE_LANGPACK_BRX] en-US = "Bodo" [STR_DESC_MODULE_LANGPACK_BRX] -en-US = "Installs Bodo support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Bodo user interface" [STR_NAME_MODULE_LANGPACK_DGO] en-US = "Dogri" [STR_DESC_MODULE_LANGPACK_DGO] -en-US = "Installs Dogri support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Dogri user interface" [STR_NAME_MODULE_LANGPACK_GD] en-US = "Scottish Gaelic" [STR_DESC_MODULE_LANGPACK_GD] -en-US = "Installs Scottish Gaelic support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Scottish Gaelic user interface" [STR_NAME_MODULE_LANGPACK_KK] en-US = "Kazakh" [STR_DESC_MODULE_LANGPACK_KK] -en-US = "Installs Kazakh support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Kazakh user interface" [STR_NAME_MODULE_LANGPACK_KOK] en-US = "Konkani" [STR_DESC_MODULE_LANGPACK_KOK] -en-US = "Installs Konkani support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Konkani user interface" [STR_NAME_MODULE_LANGPACK_KS] en-US = "Kashmiri" [STR_DESC_MODULE_LANGPACK_KS] -en-US = "Installs Kashmiri support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Kashmiri user interface" [STR_NAME_MODULE_LANGPACK_KY] en-US = "Kyrgyz" [STR_DESC_MODULE_LANGPACK_KY] -en-US = "Installs Kyrgyz support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Kyrgyz user interface" [STR_NAME_MODULE_LANGPACK_MAI] en-US = "Maithili" [STR_DESC_MODULE_LANGPACK_MAI] -en-US = "Installs Maithili support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Maithili user interface" [STR_NAME_MODULE_LANGPACK_ML] en-US = "Malayalam" [STR_DESC_MODULE_LANGPACK_ML] -en-US = "Installs Malayalam support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Malayalam user interface" [STR_NAME_MODULE_LANGPACK_MNI] en-US = "Manipuri" [STR_DESC_MODULE_LANGPACK_MNI] -en-US = "Installs Manipuri support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Manipuri user interface" [STR_NAME_MODULE_LANGPACK_PAP] en-US = "Papiamento" [STR_DESC_MODULE_LANGPACK_PAP] -en-US = "Installs Papiamento support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Papiamento user interface" [STR_NAME_MODULE_LANGPACK_PS] en-US = "Pashto" [STR_DESC_MODULE_LANGPACK_PS] -en-US = "Installs Pashto support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Pashto user interface" [STR_NAME_MODULE_LANGPACK_SA_IN] en-US = "Sanskrit (India)" [STR_DESC_MODULE_LANGPACK_SA_IN] -en-US = "Installs Sanskrit support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Sanskrit user interface" [STR_NAME_MODULE_LANGPACK_SAT] en-US = "Santali" [STR_DESC_MODULE_LANGPACK_SAT] -en-US = "Installs Santali support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Santali user interface" [STR_NAME_MODULE_LANGPACK_SC] en-US = "Sardinian" [STR_DESC_MODULE_LANGPACK_SC] -en-US = "Installs Sardinian support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Sardinian user interface" [STR_NAME_MODULE_LANGPACK_SD] en-US = "Sindhi" [STR_DESC_MODULE_LANGPACK_SD] -en-US = "Installs Sindhi support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Sindhi user interface" [STR_NAME_MODULE_LANGPACK_TE] en-US = "Telugu" [STR_DESC_MODULE_LANGPACK_TE] -en-US = "Installs Telugu support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Telugu user interface" [STR_NAME_MODULE_LANGPACK_TI] en-US = "Tigrinya" [STR_DESC_MODULE_LANGPACK_TI] -en-US = "Installs Tigrinya support in %PRODUCTNAME %PRODUCTVERSION" +en-US = "Installs the Tigrinya user interface" diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index 24a2cba71dd0..6aa7c4eb8c03 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -627,7 +627,6 @@ 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/ooo/ure.scp b/scp2/source/ooo/ure.scp index 16fe7071e789..6d61daff3df0 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -170,74 +170,6 @@ End // Public Dynamic Libraries: -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_File_Lib_Msvcr80_Ure - BIN_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_URE_DL_DIR; -#ifndef _DEBUG_RUNTIME - Name = "msvcr80.dll"; -#else - Name = "msvcr80d.dll"; -#endif -End -#endif -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_File_Lib_Msvcp80_Ure - BIN_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_URE_DL_DIR; -#ifndef _DEBUG_RUNTIME - Name = "msvcp80.dll"; -#else - Name = "msvcp80d.dll"; -#endif -End -#endif -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_File_Lib_Msvcm80_Ure - BIN_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_URE_DL_DIR; -#ifndef _DEBUG_RUNTIME - Name = "msvcm80.dll"; -#else - Name = "msvcm80d.dll"; -#endif -End -#endif -#endif -#endif - -#if defined(WNT) -#if defined(M1400) -#if defined(PROF_EDITION) -File gid_File_Msvcm80crt_Manifest_Ure - BIN_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_URE_DL_DIR; -#ifndef _DEBUG_RUNTIME - Name = "Microsoft.VC80.CRT.manifest"; -#else - Name = "Microsoft.VC80.DebugCRT.manifest"; -#endif -End -#endif -#endif -#endif - File gid_File_Dl_Cppu TXT_FILE_BODY; Dir = SCP2_URE_DL_DIR; @@ -529,9 +461,7 @@ File gid_File_Dl_Cli_Ure_Assembly Version = "${CLI_URE_NEW_VERSION}"; Culture = "neutral"; Attributes = "0"; -#ifndef M1310 ProcessorArchitecture = "MSIL"; -#endif End #endif @@ -548,9 +478,7 @@ File gid_File_Dl_Policy_Cli_Ure_Assembly Version = "${CLI_URE_POLICY_VERSION}"; Culture = "neutral"; Attributes = "0"; -#ifndef M1310 ProcessorArchitecture = "MSIL"; -#endif End #endif @@ -579,9 +507,7 @@ File gid_File_Dl_Cli_Basetypes_Assembly Version = "${CLI_BASETYPES_NEW_VERSION}"; Culture = "neutral"; Attributes = "0"; -#ifndef M1310 ProcessorArchitecture = "MSIL"; -#endif End #endif @@ -598,9 +524,7 @@ File gid_File_Dl_Policy_Cli_Basetypes_Assembly Version = "${CLI_BASETYPES_POLICY_VERSION}"; Culture = "neutral"; Attributes = "0"; -#ifndef M1310 ProcessorArchitecture = "MSIL"; -#endif End #endif @@ -629,9 +553,7 @@ File gid_File_Dl_Cli_Uretypes_Assembly Version = "${CLI_URETYPES_NEW_VERSION}"; Culture = "neutral"; Attributes = "0"; -#ifndef M1310 ProcessorArchitecture = "MSIL"; -#endif End #endif @@ -648,9 +570,7 @@ File gid_File_Dl_Policy_Cli_Uretypes_Assembly Version = "${CLI_URETYPES_POLICY_VERSION}"; Culture = "neutral"; Attributes = "0"; -#ifndef M1310 ProcessorArchitecture = "MSIL"; -#endif End #endif @@ -679,9 +599,7 @@ File gid_File_Lib_Cli_Cppuhelper_Assembly Version = "${CLI_CPPUHELPER_NEW_VERSION}"; Culture = "neutral"; Attributes = "0"; -#ifndef M1310 ProcessorArchitecture = "x86"; -#endif End #endif @@ -698,9 +616,7 @@ File gid_File_Lib_Policy_Cli_Cppuhelper_Assembly Version = "${CLI_CPPUHELPER_POLICY_VERSION}"; Culture = "neutral"; Attributes = "0"; -#ifndef M1310 ProcessorArchitecture = "x86"; -#endif End #endif @@ -952,7 +868,7 @@ File gid_File_Dl_Stlport Name = SCP2_URE_DL_NORMAL("stlport_sunpro"); #endif #endif -#elif defined WNT && (defined(M1310) || defined(M1400) || defined(M1500) || defined (M1600) ) +#elif defined WNT && ((_MSC_VER == 1500) || (_MSC_VER == 1600)) #if defined _DEBUG_RUNTIME Name = SCP2_URE_DL_NORMAL("stlport_vc71_stldebug45"); #else diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index 3a3a807ce62b..2895c5c8b27e 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,7 +107,7 @@ End //Scripting Framework Python example scripts File gid_File_Scripts_Python - TXT_FILE_BODY; + TXT_FILE_BODY; Styles = (ARCHIVE); Dir = gid_Dir_Share_Scripts; Name = "ScriptsPython.zip"; @@ -300,10 +300,14 @@ End #ifdef UNX -// pyuno.so even on Mac OS X, because it is a python module File gid_File_Pyuno TXT_FILE_BODY; +#ifdef MACOSX + // note: Mac OS X use .dylib, even for python modules + Name = "pyuno.dylib"; +#else Name = "pyuno.so"; +#endif Dir = gid_Dir_Program; Styles = (PACKED); End diff --git a/scp2/source/python/module_python_mailmerge.scp b/scp2/source/python/module_python_mailmerge.scp index ee92ef12d523..53ed507acd08 100644 --- a/scp2/source/python/module_python_mailmerge.scp +++ b/scp2/source/python/module_python_mailmerge.scp @@ -35,5 +35,11 @@ File gid_File_Pymailmerge Name = "mailmerge.py"; Styles = (PACKED); End +File gid_File_Pymailmerge_msgbox + TXT_FILE_BODY; + Dir = gid_Dir_Program; + Name = "msgbox.py"; + Styles = (PACKED); +End #endif #endif diff --git a/scp2/source/quickstart/folderitem_quickstart.scp b/scp2/source/quickstart/folderitem_quickstart.scp index 9de0a7ce36b4..b533637cc788 100644 --- a/scp2/source/quickstart/folderitem_quickstart.scp +++ b/scp2/source/quickstart/folderitem_quickstart.scp @@ -30,7 +30,6 @@ 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 cf9d5ad45e35..7541e1d2d344 100644 --- a/scp2/source/writer/folderitem_writer.scp +++ b/scp2/source/writer/folderitem_writer.scp @@ -29,7 +29,6 @@ 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; |