codepage option to mount requires only numeric values, eg "437" and not "cp437"

Changed accordingly in the lists

1 files changed, 23 insertions, 23 deletions

diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index abdab134a..59b481fae 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -47,7 +47,7 @@ my %languages = (
   'et'  => [ 'Estonian',		'iso-8859-15','et', 'et' ],
   'eu'  => [ 'Euskara (Basque)',	'iso-8859-1', 'eu', 'eu:es_ES:fr_FR:es:fr' ],
   'fa'  => [ 'Farsi (Iranian)',		'isiri-3342', 'fa', 'fa' ],
-  'fi'  => [ 'Suomi (Finnish)',		'iso-8859-15', 'fi', 'fi' ],
+  'fi'  => [ 'Finnish (Suomi)',		'iso-8859-15', 'fi', 'fi' ],
 #-'fo'  => [ 'Faroese',			'iso-8859-1', 'fo', 'fo' ],
 'fr_BE' => [ 'French|Belgium',		'iso-8859-1', 'fr', 'fr_BE:fr' ],
 'fr_CA' => [ 'French|Canada',		'iso-8859-1', 'fr', 'fr_CA:fr' ],
@@ -192,72 +192,72 @@ my %charsets = (
     undef,	undef, std_("armscii-8") ],
 #- chinese needs special console driver for text mode
   "Big5"       => [ undef,		undef,		undef,
-	"big5", "cp950", "-*-*-*-*-*-*-*-*-*-*-*-*-big5-0" ],
+	"big5", "950", "-*-*-*-*-*-*-*-*-*-*-*-*-big5-0" ],
   "gb2312"     => [ undef,		undef,		undef,
-	"gb2312", "cp936", "-*-*-*-*-*-*-*-*-*-*-*-*-gb2312.1980-0" ],
+	"gb2312", "936", "-*-*-*-*-*-*-*-*-*-*-*-*-gb2312.1980-0" ],
   "georgian-academy" => [ "t_geors", "geors.uni",	"trivial.trans",
 	undef,  undef, "-*-*-*-*-*-*-*-*-*-*-*-*-georgian-academy" ],
   "georgian-ps" => [ "t_geors",		"geors.uni",	"geors_to_geops.trans",
 	undef,  undef, "-*-*-*-*-*-*-*-*-*-*-*-*-georgian-academy" ],
   "iso-8859-1" => [ "lat0-sun16",	undef,		"iso15",
-	"iso8859-1", "cp850", sub { std("iso8859-1", @_) } ],
+	"iso8859-1", "850", sub { std("iso8859-1", @_) } ],
   "iso-8859-2" => [ "lat2-sun16",	undef,		"iso02",
-	"iso8859-2", "cp852", sub { std("iso8859-2", @_) } ],
+	"iso8859-2", "852", sub { std("iso8859-2", @_) } ],
   "iso-8859-3" => [ "iso03.f16",	undef,		"iso03",
 	"iso8859-3", undef, std_("iso8859-3") ],
   "iso-8859-4" => [ "lat4u-16",		undef,		"iso04",
-	"iso8859-4", "cp775", std_("iso8859-4") ],
+	"iso8859-4", "775", std_("iso8859-4") ],
   "iso-8859-5" => [ "iso05.f16",	"iso05",	"trivial.trans",
-  	"iso8859-5", "cp855", 
+  	"iso8859-5", "855", 
 	std2("iso8859-5", 10), std2("iso8859-5",  8) ],
 #-#- arabic needs special console driver for text mode [acon]
 #-#- (and gtk support isn't done yet)
   "iso-8859-6" => [ "iso06.f16",	"iso06",	"trivial.trans",
-    "iso8859-6", "cp864", std_("iso8859-6") ],
+    "iso8859-6", "864", std_("iso8859-6") ],
   "iso-8859-7" => [ "iso07.f16",	"iso07",	"trivial.trans",
-	"iso8859-7", "cp869", std_("iso8859-7") ],
+	"iso8859-7", "869", std_("iso8859-7") ],
 #-#- hebrew needs special console driver for text mode [acon]
 #-#- (and gtk support isn't done yet)
    "iso-8859-8" => [ "iso08.f16",	"iso08",	"trivial.trans",
 #	std_("iso8859-8") ],
-	"iso8859-8", "cp862", std_("microsoft-cp1255") ],
+	"iso8859-8", "862", std_("microsoft-cp1255") ],
   "iso-8859-9" => [ "iso09.f16",	"iso09",	"trivial.trans",
-	"iso8859-9", "cp857", sub { std("iso8859-9", @_) } ],
+	"iso8859-9", "857", sub { std("iso8859-9", @_) } ],
   "iso-8859-13" => [ "tlat7",		"iso01",	"trivial.trans",
-	"iso8859-13", "cp775", std_("iso8859-13") ],
+	"iso8859-13", "775", std_("iso8859-13") ],
   "iso-8859-14" => [ "tlat8",		"iso01",	"trivial.trans",
-	"iso8859-14", "cp850", std_("iso8859-14") ],
+	"iso8859-14", "850", std_("iso8859-14") ],
   "iso-8859-15" => [ "lat0-sun16",	undef,		"iso15",
-	"iso8859-15", "cp850", std("iso8859-15") ],
+	"iso8859-15", "850", std("iso8859-15") ],
   "iso-8859-9e" => [ "tiso09e",		"iso09",	"trivial.trans",
-	"iso8859-9", "cp857", std2("iso8859-9e",10) ],
+	"iso8859-9", "857", std2("iso8859-9e",10) ],
 #- japanese needs special console driver for text mode [kon2]
   "jisx0208"   => [ undef,		undef,		"trivial.trans",
-	"euc-jp", "cp932", "-*-*-*-*-*-*-*-*-*-*-*-*-jisx*.*-0" ],
+	"euc-jp", "932", "-*-*-*-*-*-*-*-*-*-*-*-*-jisx*.*-0" ],
   "koi8-r"     => [ "UniCyr_8x16",	undef,		"koi8-r",
-	"koi8-r", "cp866", std("koi8-r") ],
+	"koi8-r", "866", std("koi8-r") ],
   "koi8-u"     => [ "UniCyr_8x16",	undef,		"koi8-u",
-	"koi8-u", "cp866", std("koi8-u") ],
+	"koi8-u", "866", std("koi8-u") ],
   "koi8-k"     => [ "koi8-k",		"iso01",	"trivial.trans",
 	undef, undef, std("koi8-c") ],
   "tatar-cyr"  => [ "tatar-cyr",	undef,		"cp1251",
 	undef, undef, std("tatar-cyr") ],
   "cp1251"     => [ "UniCyr_8x16",	undef,		"cp1251",
-	"cp1251", "cp866", sub { std("microsoft-cp1251", @_) } ],
+	"cp1251", "866", sub { std("microsoft-cp1251", @_) } ],
 #- Yiddish needs special console driver for text mode [acon]
 #- (and gtk support isn't done yet)
   "cp1255"     => [ "iso08.f16",        "iso08",        "trivial.trans",
-	"cp1255", "cp862", std_("microsoft-cp1255") ],
+	"cp1255", "862", std_("microsoft-cp1255") ],
 #- Urdu needs special console driver for text mode [acon]
 #- (and gtk support isn't done yet)
   "cp1256"     => [ undef,              undef,          "trivial.trans",
-	undef, "cp864", std_("microsoft-cp1255") ],
+	undef, "864", std_("microsoft-cp1255") ],
 #- korean needs special console driver for text mode
   "ksc5601"    => [ undef,		undef,		undef,
-	"euc-kr", "cp949", "-*-*-*-*-*-*-*-*-*-*-*-*-ksc5601.1987-*" ],
+	"euc-kr", "949", "-*-*-*-*-*-*-*-*-*-*-*-*-ksc5601.1987-*" ],
 #- I have no console font for Thai...
   "tis620"     => [ undef,		undef,		"trivial.trans",
-	"tis-620", "cp874", std2("tis620.2533-1",12) ],
+	"tis-620", "874", std2("tis620.2533-1",12) ],
   "tcvn"       => [ "tcvn8x16",		"tcvn",		"trivial.trans",
 	undef, undef, std2("tcvn-5712", 13), std2("tcvn-5712", 10) ],
   "viscii"     => [ "viscii10-8x16",	"viscii.uni",	"viscii1.0_to_viscii1.1.trans",