Removed en-US duplicate dicts in langpacks.

This reverts commit 995e00694bb38e00f3b2b8decd44c88d56863484, and
f6b3c7c837eec9f79e76c8e8587d9f635ff82203, to fix fdo#36907. It also permits
some user control over which dicts should be there.

Fix for fdo#34910. Also aligns dictionary names with
bootstrap's 838aba9d2f29464ffbecbdd12fa9e39ec7ce6dd6 commit - which
in turn fixes fdo#36926.

Signed-off-by: Andras Timar <timar74@gmail.com>

1 files changed, 40 insertions, 100 deletions

diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt
index a628509d63d6..aa90dc53fe99 100644
--- a/setup_native/source/packinfo/spellchecker_selection.txt
+++ b/setup_native/source/packinfo/spellchecker_selection.txt
@@ -8,107 +8,47 @@
 # shall be included into the language pack, the keyword "EMPTY" can
 # be used as first entry.
 
-af = "EMPTY"
+af = "af"
 ar = "EMPTY"
-as = "EMPTY"
-ast = "EMPTY"
-be = "EMPTY"
-bg = "EMPTY"
-bn = "EMPTY"
-bo = "EMPTY"
-br = "EMPTY"
-brx = "EMPTY"
-bs = "EMPTY"
-ca = "EMPTY"
-ca-XV = "EMPTY"
-cs = "EMPTY"
-cy = "EMPTY"
-da = "EMPTY"
-de = "EMPTY"
-dgo = "EMPTY"
-dz = "EMPTY"
-el = "EMPTY"
-en-GB = "EMPTY"
-en-US = "EMPTY,af,br,ca,cs,da,de-AT,de-CH,de-DE,en,es,et,fr,gl,he,hr,hu,it,ku-TR,lt,ne,nl,no,oc,pl,pt,ro,ru,sk,sl,sr,sv,sw,th,uk,vi,zu"
-en-ZA = "EMPTY"
-eo = "EMPTY"
-es = "EMPTY"
-et = "EMPTY"
-eu = "EMPTY"
-fa = "EMPTY"
-fi = "EMPTY"
-fr = "EMPTY"
-ga = "EMPTY"
-gl = "EMPTY"
-gu = "EMPTY"
-he = "EMPTY"
-hi = "EMPTY"
-hr = "EMPTY"
-hu = "EMPTY"
-id = "EMPTY"
-is = "EMPTY"
-it = "EMPTY"
+ca = "ca,es,fr"
+cs = "cs"
+da = "da,de-DE"
+de = "de-DE,de-AT,de-CH,fr,it"
+en-US = "en,es,fr"
+en-GB = "en,es,fr"
+es = "es,fr,pt"
+et = "et"
+fr = "fr,es"
+gl = "gl,pt,es"
+he = "he"
+hu = "hu,de-DE"
+hr = "hr,de-DE"
+it = "it,de-DE,fr"
 ja = "EMPTY"
-ka = "EMPTY"
-kk = "EMPTY"
-km = "EMPTY"
-kn = "EMPTY"
 ko = "EMPTY"
-kok = "EMPTY"
-ks = "EMPTY"
-ku = "EMPTY"
-lo = "EMPTY"
-lt = "EMPTY"
-lv = "EMPTY"
-mai = "EMPTY"
-mk = "EMPTY"
-ml = "EMPTY"
-mn = "EMPTY"
-mni = "EMPTY"
-mr = "EMPTY"
-my = "EMPTY"
-nb = "EMPTY"
-ne = "EMPTY"
-nl = "EMPTY"
-nn = "EMPTY"
-nr = "EMPTY"
-nso = "EMPTY"
-oc = "EMPTY"
-om = "EMPTY"
-or = "EMPTY"
-pa-IN = "EMPTY"
-pl = "EMPTY"
-pt = "EMPTY"
-pt-BR = "EMPTY"
-ro = "EMPTY"
-ru = "EMPTY"
-rw = "EMPTY"
-sa-IN = "EMPTY"
-sat = "EMPTY"
-sd = "EMPTY"
-sh = "EMPTY"
-si = "EMPTY"
-sk = "EMPTY"
-sl = "EMPTY"
-sq = "EMPTY"
-sr = "EMPTY"
-ss = "EMPTY"
-st = "EMPTY"
-sv = "EMPTY"
-sw-TZ = "EMPTY"
-ta = "EMPTY"
-te = "EMPTY"
-tg = "EMPTY"
-th = "EMPTY"
-tn = "EMPTY"
-tr = "EMPTY"
-ts = "EMPTY"
-ug = "EMPTY"
-uk = "EMPTY"
-uz = "EMPTY"
-ve = "EMPTY"
-vi = "EMPTY"
-xh = "EMPTY"
-zh-CN = "EMPTY"
+ku = "ku-TR"
+lt = "lt"
+nb = "no,fr,de-DE,es"
+ne = "ne"
+nl = "nl,fr,de-DE"
+nn = "no,fr,de-DE,es"
+oc = "oc,fr"
+pl = "pl,de-DE,ru"
+pt-BR = "pt,es"
+pt = "pt,es"
+ro = "ro,de-DE,hu"
+ru = "ru,de-DE"
+sk = "sk"
+sl = "sl"
+sv = "sv,de-DE"
+sr = "sr"
+# ! Note the package 'sr' also holds the dictionaries for 'sh' !
+sh = "sr"
+sw = "sw"
+th = "th"
+uk = "uk,ru"
+vi = "vi,fr"
 zh-TW = "EMPTY"
-zu = "EMPTY"
+zh-CN = "EMPTY"
+zu = "zu"
+