merge 3 dictionary packs into 1

4 files changed, 13 insertions, 75 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"