merge 3 dictionary packs into 1

6 files changed, 29 insertions, 123 deletions

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index f17655978db8..a465cb55c434 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -241,19 +241,9 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Da
     DosName = "dict-da";
 End
 
-Directory gid_Brand_Dir_Share_Extensions_Dict_De_At
+Directory gid_Brand_Dir_Share_Extensions_Dict_De
     ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-de-AT";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_De_Ch
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-de-CH";
-End
-
-Directory gid_Brand_Dir_Share_Extensions_Dict_De_De
-    ParentID = gid_Brand_Dir_Share_Extensions;
-    DosName = "dict-de-DE";
+    DosName = "dict-de";
 End
 
 Directory gid_Brand_Dir_Share_Extensions_Dict_En
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 4b0db36e2d7a..ef8e2faaf247 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1848,33 +1848,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_De_AT
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_De_At;
-	Name = "dict-de-AT.oxt";
+File gid_File_Extension_Dictionary_De
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_De;
+	Name = "dict-de.oxt";
 	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
 	UnixRights = 444;
 End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_De_CH
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_De_Ch;
-    Name = "dict-de-CH.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
-File gid_File_Extension_Dictionary_De_DE
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_De_De;
-    Name = "dict-de-DE.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
-    UnixRights = 444;
-End
-#endif
-
-#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_En
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_En;
 	Name = "dict-en.oxt";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 293878bc9e71..9162f09f82e7 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -111,34 +111,12 @@ Module gid_Module_Root_Extension_Dictionary_Da
     Styles = ();
 End
 
-Module gid_Module_Root_Extension_Dictionary_De_AT
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_AT );
-    Files = (gid_File_Extension_Dictionary_De_AT);
+Module gid_Module_Root_Extension_Dictionary_De
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE );
+    Files = (gid_File_Extension_Dictionary_De);
     InstallOrder = "2000";
     Sortkey = "570";
-    Spellcheckerlanguage = "de-AT";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_De_CH
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_CH );
-    Files = (gid_File_Extension_Dictionary_De_CH);
-    InstallOrder = "2000";
-    Sortkey = "580";
-    Spellcheckerlanguage = "de-CH";
-    PackageInfo = "packinfo_office.txt";
-    ParentID = gid_Module_Dictionaries;
-    Styles = ();
-End
-
-Module gid_Module_Root_Extension_Dictionary_De_DE
-    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_DE_DE );
-    Files = (gid_File_Extension_Dictionary_De_DE);
-    InstallOrder = "2000";
-    Sortkey = "575";
-    Spellcheckerlanguage = "de-DE";
+    Spellcheckerlanguage = "de";
     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 49219cf76422..86de27abf64e 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -79,23 +79,11 @@ en-US = "Danish"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_DA]
 en-US = "Spelling and hyphenation dictionary for Danish"
 
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_AT]
-en-US = "German (Austria)"
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE]
+en-US = "German"
 
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_AT]
-en-US = "German (AT-frami) spelling, hyphenation, thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_CH]
-en-US = "German (Switzerland)"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_CH]
-en-US = "German (CH-frami) spelling, hyphenation, thesaurus"
-
-[STR_NAME_MODULE_EXTENSION_DICTIONARY_DE_DE]
-en-US = "German (Germany)"
-
-[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE_DE]
-en-US = "German (DE-frami) spelling, hyphenation, thesaurus"
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_DE]
+en-US = "German spelling, hyphenation, thesaurus"
 
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_EN]
 en-US = "English"
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index 3d0f68ab7663..0f083e9bfcce 100755
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -572,49 +572,17 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
-module = "gid_Module_Root_Extension_Dictionary_De_AT"
+module = "gid_Module_Root_Extension_Dictionary_De"
 script = "shellscripts_extensions.txt"
-solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de-AT"
+solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de"
 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-de-AT"
+packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de"
 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 = "De-AT dictionary for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
-Start
-module = "gid_Module_Root_Extension_Dictionary_De_CH"
-script = "shellscripts_extensions.txt"
-solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de-CH"
-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-de-CH"
-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 = "De-CH dictionary for %PRODUCTNAME %PRODUCTVERSION"
-destpath = "/opt"
-packageversion = "%PACKAGEVERSION"
-End
-
-Start
-module = "gid_Module_Root_Extension_Dictionary_De_DE"
-script = "shellscripts_extensions.txt"
-solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-de-DE"
-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-de-DE"
-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 = "De-DE dictionary for %PRODUCTNAME %PRODUCTVERSION"
+description = "De dictionary for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index 08de3a622369..517295858daf 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -13,8 +13,8 @@ ar = "EMPTY"
 br = "br,fr"
 ca = "ca,es,fr"
 cs = "cs"
-da = "da,de-DE"
-de = "de-DE,de-AT,de-CH,fr,it"
+da = "da,de"
+de = "de,fr,it"
 en-US = "en,es,fr"
 en-GB = "en,es,fr"
 es = "es,fr,pt"
@@ -22,26 +22,26 @@ et = "et"
 fr = "fr,es"
 gl = "gl,pt,es"
 he = "he"
-hu = "hu,de-DE"
-hr = "hr,de-DE"
-it = "it,de-DE,fr"
+hu = "hu,de"
+hr = "hr,de"
+it = "it,de,fr"
 ja = "EMPTY"
 ko = "EMPTY"
 ku = "ku-TR"
 lt = "lt"
-nb = "no,fr,de-DE,es"
+nb = "no,fr,de,es"
 ne = "ne"
-nl = "nl,fr,de-DE"
-nn = "no,fr,de-DE,es"
+nl = "nl,fr,de"
+nn = "no,fr,de,es"
 oc = "oc,fr"
-pl = "pl,de-DE,ru"
+pl = "pl,de,ru"
 pt-BR = "pt,es"
 pt = "pt,es"
-ro = "ro,de-DE,hu"
-ru = "ru,de-DE"
+ro = "ro,de,hu"
+ru = "ru,de"
 sk = "sk"
 sl = "sl"
-sv = "sv,de-DE"
+sv = "sv,de"
 sr = "sr"
 # ! Note the package 'sr' also holds the dictionaries for 'sh' !
 sh = "sr"