summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scp2/source/ooo/common_brand.scp5
-rw-r--r--scp2/source/ooo/file_ooo.scp9
-rw-r--r--scp2/source/ooo/module_ooo.scp13
-rw-r--r--scp2/source/ooo/module_ooo.ulf6
-rw-r--r--setup_native/source/packinfo/packinfo_office.txt16
-rw-r--r--setup_native/source/packinfo/spellchecker_selection.txt6
6 files changed, 51 insertions, 4 deletions
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 2cdf18317b94..a4b487f4327c 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -336,6 +336,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Pt
DosName = "dict-pt";
End
+Directory gid_Brand_Dir_Share_Extensions_Dict_Pt_Pt
+ ParentID = gid_Brand_Dir_Share_Extensions;
+ DosName = "dict-pt-pt";
+End
+
Directory gid_Brand_Dir_Share_Extensions_Dict_Ro
ParentID = gid_Brand_Dir_Share_Extensions;
DosName = "dict-ro";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ad46442e2253..61589b6e55c1 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -2019,6 +2019,15 @@ End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Pt_Pt
+ Dir = gid_Brand_Dir_Share_Extensions_Dict_Pt_Pt;
+ Name = "dict-pt-pt.oxt";
+ Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+ UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Ro
Dir = gid_Brand_Dir_Share_Extensions_Dict_Ro;
Name = "dict-ro.oxt";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index d8b3397c4d63..d94acf4df8e0 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -314,7 +314,18 @@ Module gid_Module_Root_Extension_Dictionary_Pt
Files = (gid_File_Extension_Dictionary_Pt);
InstallOrder = "2000";
Sortkey = "515";
- Spellcheckerlanguage = "pt";
+ Spellcheckerlanguage = "pt-BR";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Dictionaries;
+ Styles = ();
+End
+
+Module gid_Module_Root_Extension_Dictionary_Pt_Pt
+ MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_PT_PT );
+ Files = (gid_File_Extension_Dictionary_Pt_Pt);
+ InstallOrder = "2000";
+ Sortkey = "515";
+ Spellcheckerlanguage = "pt-PT";
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Dictionaries;
Styles = ();
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 2511277edea3..65c343a0f6a9 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -193,6 +193,12 @@ en-US = "Brazilian Portuguese"
[STR_DESC_MODULE_EXTENSION_DICTIONARY_PT]
en-US = "Brazilian Portuguese Spelling Dictionary - 1990 Spelling Agreement"
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_PT_PT]
+en-US = "Portuguese"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_PT_PT]
+en-US = "European Portuguese Dictionaries"
+
[STR_NAME_MODULE_EXTENSION_DICTIONARY_RO]
en-US = "Romanian"
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 9412301f6d5b..5ec443bf9696 100644
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -876,6 +876,22 @@ packageversion = "%PACKAGEVERSION"
End
Start
+module = "gid_Module_Root_Extension_Dictionary_Pt_Pt"
+script = "shellscripts_extensions.txt"
+solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-pt-pt"
+solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06, %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07, %PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pt-pt"
+requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
+linuxpatchrequires = ""
+copyright = "1999-2010 by Oracle"
+solariscopyright = "solariscopyrightfile"
+vendor = "Oracle"
+description = "Pt-PT dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
module = "gid_Module_Root_Extension_Dictionary_Ro"
script = "shellscripts_extensions.txt"
solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ro"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index 6b34a60a0b16..51944c0fbeb5 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -20,7 +20,7 @@ en-GB = "en,es,fr"
es = "es,fr,pt"
et = "et"
fr = "fr,es"
-gl = "gl,pt,es"
+gl = "gl,pt-PT,es"
he = "he"
hu = "hu,de"
hr = "hr,de"
@@ -35,8 +35,8 @@ nl = "nl,fr,de"
nn = "no,fr,de,es"
oc = "oc,fr"
pl = "pl,de,ru"
-pt-BR = "pt,es"
-pt = "pt,es"
+pt-BR = "pt-BR,es"
+pt = "pt-PT,es"
ro = "ro,de,hu"
ru = "ru,de"
sk = "sk"