[Libreoffice-commits] .: 4 commits - scp2/source setup_native/source

Andras Timar timar at kemper.freedesktop.org
Thu Sep 1 05:39:16 PDT 2011


 scp2/source/ooo/common_brand.scp                        |   24 ++---
 scp2/source/ooo/file_ooo.scp                            |   42 ++++-----
 scp2/source/ooo/module_ooo.scp                          |   54 ++++++------
 scp2/source/ooo/module_ooo.ulf                          |   34 +++----
 setup_native/source/packinfo/packinfo_office.txt        |   72 ++++++++--------
 setup_native/source/packinfo/spellchecker_selection.txt |   32 +++----
 6 files changed, 129 insertions(+), 129 deletions(-)

New commits:
commit afac5725dc27c54823e48c582d9f65bdcae8127f
Author: Andras Timar <atimar at suse.com>
Date:   Thu Sep 1 14:13:06 2011 +0200

    correct description of Czech dictionary pack

diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 65c343a..bf3687c 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -77,7 +77,7 @@ en-US = "Spelling and hyphenation dictionaries and thesaurus for Catalan languag
 en-US = "Czech"
 
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_CS]
-en-US = "Czech thesaurus"
+en-US = "Czech spelling, hyphenation, thesaurus"
 
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_DA]
 en-US = "Danish"
commit de3aec237a2b005017d4c9a7121e65efe28fb8e6
Author: Andras Timar <atimar at suse.com>
Date:   Thu Sep 1 14:25:33 2011 +0200

    add European Portoguise dictionary pack

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 2cdf183..a4b487f 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 ad46442..61589b6 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 d8b3397..d94acf4 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 2511277..65c343a 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 9412301..5ec443b 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 6b34a60..51944c0 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"
commit b325ea0165adbd9ec31e007805d6e790be2d64e1
Author: Andras Timar <atimar at suse.com>
Date:   Thu Sep 1 14:19:21 2011 +0200

    add Arabic dictionary pack

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a465cb5..2cdf183 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -221,6 +221,11 @@ Directory gid_Brand_Dir_Share_Extensions_Dict_Af
     DosName = "dict-af";
 End
 
+Directory gid_Brand_Dir_Share_Extensions_Dict_Ar
+    ParentID = gid_Brand_Dir_Share_Extensions;
+    DosName = "dict-ar";
+End
+
 Directory gid_Brand_Dir_Share_Extensions_Dict_Br
     ParentID = gid_Brand_Dir_Share_Extensions;
     DosName = "dict-br";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index ef8e2fa..ad46442 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1812,6 +1812,15 @@ End
 #endif
 
 #ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_Ar
+	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ar;
+	Name = "dict-ar.oxt";
+	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Br
 	Dir = gid_Brand_Dir_Share_Extensions_Dict_Br;
 	Name = "dict-br.oxt";
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 9162f09..d8b3397 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -67,6 +67,17 @@ Module gid_Module_Root_Extension_Dictionary_Af
     Styles = ();
 End
 
+Module gid_Module_Root_Extension_Dictionary_Ar
+    MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_AR );
+    Files = (gid_File_Extension_Dictionary_Ar);
+    InstallOrder = "2000";
+    Sortkey = "510";
+    Spellcheckerlanguage = "ar";
+    PackageInfo = "packinfo_office.txt";
+    ParentID = gid_Module_Dictionaries;
+    Styles = ();
+End
+
 Module gid_Module_Root_Extension_Dictionary_Br
     MOD_NAME_DESC ( MODULE_EXTENSION_DICTIONARY_BR );
     Files = (gid_File_Extension_Dictionary_Br);
diff --git a/scp2/source/ooo/module_ooo.ulf b/scp2/source/ooo/module_ooo.ulf
index 86de27a..2511277 100644
--- a/scp2/source/ooo/module_ooo.ulf
+++ b/scp2/source/ooo/module_ooo.ulf
@@ -55,6 +55,12 @@ en-US = "Afrikaans"
 [STR_DESC_MODULE_EXTENSION_DICTIONARY_AF]
 en-US = "Afrikaans spell checker"
 
+[STR_NAME_MODULE_EXTENSION_DICTIONARY_AR]
+en-US = "Arabic"
+
+[STR_DESC_MODULE_EXTENSION_DICTIONARY_AR]
+en-US = "Arabic spell checker and thesaurus"
+
 [STR_NAME_MODULE_EXTENSION_DICTIONARY_BR]
 en-US = "Breton"
 
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
old mode 100755
new mode 100644
index 0f083e9..9412301
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -508,6 +508,22 @@ packageversion = "%PACKAGEVERSION"
 End
 
 Start
+module = "gid_Module_Root_Extension_Dictionary_Ar"
+script = "shellscripts_extensions.txt"
+solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-ar"
+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-ar"
+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 = "2006-2008 by Mohamed Kebdani, 2006-2009 Taha Zerrouki"
+solariscopyright = "solariscopyrightfile"
+vendor = "Ayaspell"
+description = "Ar dictionary for %PRODUCTNAME %PRODUCTVERSION"
+destpath = "/opt"
+packageversion = "%PACKAGEVERSION"
+End
+
+Start
 module = "gid_Module_Root_Extension_Dictionary_Br"
 script = "shellscripts_extensions.txt"
 solarispackagename = "%PACKAGEPREFIX%SOLARISBRANDPACKAGENAME%BRANDPACKAGEVERSION-dict-br"
diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index 5172958..6b34a60 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -9,7 +9,7 @@
 # be used as first entry.
 
 af = "af"
-ar = "EMPTY"
+ar = "ar"
 br = "br,fr"
 ca = "ca,es,fr"
 cs = "cs"
commit ee3b2614485740f6d329874e4bb30a1a0141368e
Author: Andras Timar <atimar at suse.com>
Date:   Thu Sep 1 14:13:06 2011 +0200

    merge 3 dictionary packs into 1

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index f176559..a465cb5 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 4b0db36..ef8e2fa 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 293878b..9162f09 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 49219cf..86de27a 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 3d0f68a..0f083e9 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 08de3a6..5172958 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"


More information about the Libreoffice-commits mailing list