2 files changed, 33 insertions, 2 deletions
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index e481c1a9b..2989186c9 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -408,11 +408,14 @@ sub getLANGUAGE {
 }
 
 my %xim = (
+#- xcin only works with 'zh_TW', 'zh_TW.Big5', 'zh_CN', 'zh_CN.GB2312'
+#- all other locale names, in particular 'zh_HK' or 'zh_TW.UTF-8'
+#- are unknown to it. So chinput is used for all but 'zh_TW'
   'zh_TW' => { 
  	ENC => 'big5',
  	XIM => 'xcin',
  	XIM_PROGRAM => 'xcin',
- 	XMODIFIERS => '"@im=xcin"',
+ 	XMODIFIERS => '"@im=xcin-zh_TW"',
  	CONSOLE_NOT_LOCALIZED => 'yes',
   },
   'zh_TW.UTF-8' => {
@@ -436,6 +439,34 @@ my %xim = (
 	XMODIFIERS => '"@im=Chinput"',
 	CONSOLE_NOT_LOCALIZED => 'yes',
   },
+  'zh_SG' => {
+	ENC => 'gb',
+	XIM => 'Chinput',
+	XIM_PROGRAM => 'chinput',
+	XMODIFIERS => '"@im=Chinput"',
+	CONSOLE_NOT_LOCALIZED => 'yes',
+  },
+  'zh_SG.UTF-8' => {
+	ENC => 'utf8',
+	XIM => 'Chinput',
+	XIM_PROGRAM => 'chinput',
+	XMODIFIERS => '"@im=Chinput"',
+	CONSOLE_NOT_LOCALIZED => 'yes',
+  },
+  'zh_HK' => {
+	ENC => 'big5',
+	XIM => 'Chinput',
+	XIM_PROGRAM => 'chinput',
+	XMODIFIERS => '"@im=Chinput"',
+	CONSOLE_NOT_LOCALIZED => 'yes',
+  },
+  'zh_HK.UTF-8' => {
+	ENC => 'utf8',
+	XIM => 'Chinput',
+	XIM_PROGRAM => 'chinput',
+	XMODIFIERS => '"@im=Chinput"',
+	CONSOLE_NOT_LOCALIZED => 'yes',
+  },
   'ko_KR' => {
 	ENC => 'kr',
 	XIM => 'Ami',
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 6a21721f9..1910dc3b2 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -58,7 +58,7 @@ my %fields =
      "Model" => [N("Model"), N("hard disk model")],
      "model" => [N("Model"), N("Generation of the cpu (eg: 8 for PentiumIII, ...)")],
      "model name" => [N("Model name"), N("Official vendor name of the cpu")],
-     "nbuttons" => [ N("Number of buttons"), N("the number of buttons the mouse have") ],
+     "nbuttons" => [ N("Number of buttons"), N("the number of buttons the mouse has") ],
      "name" => [ N("Name"), N("the name of the CPU") ],
      "port" => [N("Port"), N("network printer port")],
      "processor" => [ N("Processor ID"), N("the number of the processor") ],