Hi, since moving all dicts into the main installer was causing some troubles here and there (see fdo#36907), and also does not permit selective installation of dictionaries on the Mac, I reverted the original fix for fdo#34910, and only remove en-US from the non-English langpacks (see patch number 3). Would like to get that reviewed for -3-4-0. Cheers, -- Thorsten
From 0ffdb730638c22c2e41f96742f4b1d013d0e4f19 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens <tbehrens@novell.com> Date: Tue, 17 May 2011 11:14:53 +0200 Subject: [PATCH 1/2] Revert "don't pack en dictionaries to en-US langpack" This reverts commit 995e00694bb38e00f3b2b8decd44c88d56863484, to fix fdo#36907. It also permits some user control over which dicts should be there. --- .../source/packinfo/spellchecker_selection.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index a628509..34ea3b2 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -29,7 +29,7 @@ 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-US = "en,af,br,ca,cs,da,de-AT,de-CH,de-DE,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" -- 1.7.3.4
From 515289d880824e2a71c5f12787efb7dd874bfcc4 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens <tbehrens@novell.com> Date: Tue, 17 May 2011 11:15:56 +0200 Subject: [PATCH 2/2] Revert "dictionaries belong to main install not to langpacks - fdo#34910" This reverts commit f6b3c7c837eec9f79e76c8e8587d9f635ff82203, to fix fdo#36907. It also permits some user control over which dicts should be there. --- .../source/packinfo/spellchecker_selection.txt | 148 ++++++-------------- 1 files changed, 44 insertions(+), 104 deletions(-) diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index 34ea3b2..f5344b9 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" -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 = "en,af,br,ca,cs,da,de-AT,de-CH,de-DE,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" -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" -zh-TW = "EMPTY" -zu = "EMPTY" +af = "af,en-US" +ar = "EMPTY,en-US" +ca = "ca,es,en-US,fr" +cs = "cs,en-US" +da = "da,de-DE,en-US" +de = "de-DE,de-AT,de-CH,en-US,fr,it" +en-US = "en-US,es,fr" +en-GB = "en-US,es,fr" +es = "es,en-US,fr,pt" +et = "et,en-US" +fr = "fr,en-US,es" +gl = "gl,en-US,pt,es" +he = "he,en-US" +hu = "hu,de-DE,en-US" +hr = "hr,de-DE,en-US" +it = "it,de-DE,en-US,fr" +ja = "EMPTY,en-US" +ko = "EMPTY,en-US" +ku = "ku-TR,en-US" +lt = "lt,en-US" +nb = "no,en-US,fr,de-DE,es" +ne = "ne,en-US" +nl = "nl,en-US,fr,de-DE" +nn = "no,en-US,fr,de-DE,es" +oc = "oc,fr,en-US" +pl = "pl,de-DE,en-US,ru" +pt-BR = "pt,en-US,es" +pt = "pt,en-US,es" +ro = "ro,en-US,de-DE,hu" +ru = "ru,de-DE,en-US" +sk = "sk,en-US" +sl = "sl,en-US" +sv = "sv,de-DE,en-US" +sr = "sr,en-US" +# ! Note the package 'sr' also holds the dictionaries for 'sh' ! +sh = "sr,en-US" +sw = "sw,en-US" +th = "th,en-US" +uk = "uk,ru,en-US" +vi = "vi,en-US,fr" +zh-TW = "EMPTY,en-US" +zh-CN = "EMPTY,en-US" +zu = "zu,en-US" + -- 1.7.3.4
From be55125b2d9fff80f276cc3080c2e10a7fe425e7 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens <tbehrens@novell.com> Date: Tue, 17 May 2011 13:40:58 +0200 Subject: [PATCH] Removed en-US duplicate dicts in langpacks. Fix for fdo#34910 --- .../source/packinfo/spellchecker_selection.txt | 80 ++++++++++---------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/setup_native/source/packinfo/spellchecker_selection.txt b/setup_native/source/packinfo/spellchecker_selection.txt index f5344b9..cad49c4 100644 --- a/setup_native/source/packinfo/spellchecker_selection.txt +++ b/setup_native/source/packinfo/spellchecker_selection.txt @@ -8,47 +8,47 @@ # shall be included into the language pack, the keyword "EMPTY" can # be used as first entry. -af = "af,en-US" -ar = "EMPTY,en-US" -ca = "ca,es,en-US,fr" -cs = "cs,en-US" -da = "da,de-DE,en-US" -de = "de-DE,de-AT,de-CH,en-US,fr,it" +af = "af" +ar = "EMPTY" +ca = "ca,es,fr" +cs = "cs" +da = "da,de-DE" +de = "de-DE,de-AT,de-CH,fr,it" en-US = "en-US,es,fr" en-GB = "en-US,es,fr" -es = "es,en-US,fr,pt" -et = "et,en-US" -fr = "fr,en-US,es" -gl = "gl,en-US,pt,es" -he = "he,en-US" -hu = "hu,de-DE,en-US" -hr = "hr,de-DE,en-US" -it = "it,de-DE,en-US,fr" -ja = "EMPTY,en-US" -ko = "EMPTY,en-US" -ku = "ku-TR,en-US" -lt = "lt,en-US" -nb = "no,en-US,fr,de-DE,es" -ne = "ne,en-US" -nl = "nl,en-US,fr,de-DE" -nn = "no,en-US,fr,de-DE,es" -oc = "oc,fr,en-US" -pl = "pl,de-DE,en-US,ru" -pt-BR = "pt,en-US,es" -pt = "pt,en-US,es" -ro = "ro,en-US,de-DE,hu" -ru = "ru,de-DE,en-US" -sk = "sk,en-US" -sl = "sl,en-US" -sv = "sv,de-DE,en-US" -sr = "sr,en-US" +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" +ko = "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,en-US" -sw = "sw,en-US" -th = "th,en-US" -uk = "uk,ru,en-US" -vi = "vi,en-US,fr" -zh-TW = "EMPTY,en-US" -zh-CN = "EMPTY,en-US" -zu = "zu,en-US" +sh = "sr" +sw = "sw" +th = "th" +uk = "uk,ru" +vi = "vi,fr" +zh-TW = "EMPTY" +zh-CN = "EMPTY" +zu = "zu" -- 1.7.3.4
Attachment:
pgpM3zPbpAoDk.pgp
Description: PGP signature