Add localized values for keyboard layouts.

BUG=none
TEST=Select a language with keyboard layouts in the IME option window.

Review URL: http://codereview.chromium.org/2309001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48472 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 146 insertions, 1 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index cb8c42c..c23b9a3 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7683,6 +7683,10 @@ Keep your key file in a safe place. You will need it to create new versions of y
                desc="The label for a input method">
         Standard input method
       </message>
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_CHINESE_QUICK_INPUT_METHOD"
+               desc="The label for the Chinese input method">
+        Chinese input method (quick)
+      </message>
       <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_PERSIAN_ISIRI_2901_INPUT_METHOD"
                desc="The label for the Persian (Farsi) input method">
         Persian input method (ISIRI 2901 layout)
@@ -7874,6 +7878,109 @@ Keep your key file in a safe place. You will need it to create new versions of y
 	Toogle Simplfied/Traditional Chinese mode
       </message>
 
+      <message name="IDS_STATUSBAR_LAYOUT_JAPAN" desc="In the language menu button, this shows the input mode.">
+	Japanese keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_SLOVENIA" desc="In the language menu button, this shows the input mode.">
+	Sloveniain keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_GERMANY" desc="In the language menu button, this shows the input mode.">
+	German keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_ITALY" desc="In the language menu button, this shows the input mode.">
+	Italian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_ESTONIA" desc="In the language menu button, this shows the input mode.">
+	Estonian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_HUNGARY" desc="In the language menu button, this shows the input mode.">
+	Hungarian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_POLAND" desc="In the language menu button, this shows the input mode.">
+	Polish keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_DENMARK" desc="In the language menu button, this shows the input mode.">
+	Danish keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_CROATIA" desc="In the language menu button, this shows the input mode.">
+	Croatian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_BRAZIL" desc="In the language menu button, this shows the input mode.">
+	Brazilian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_SERBIA" desc="In the language menu button, this shows the input mode.">
+	Serbian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_CZECHIA" desc="In the language menu button, this shows the input mode.">
+	Czechian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_USA_DVORAK" desc="In the language menu button, this shows the input mode.">
+	English (Dvorak) keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_ROMANIA" desc="In the language menu button, this shows the input mode.">
+	Romanian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_USA" desc="In the language menu button, this shows the input mode.">
+	English (USA) keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_LITHUANIA" desc="In the language menu button, this shows the input mode.">
+	Lithuanian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_UNITED_KINGDOM" desc="In the language menu button, this shows the input mode.">
+	English (UK) keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_SLOVAKIA" desc="In the language menu button, this shows the input mode.">
+	Slovakian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_RUSSIA" desc="In the language menu button, this shows the input mode.">
+	Russian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_GREECE" desc="In the language menu button, this shows the input mode.">
+	Greek keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_BELGIUM" desc="In the language menu button, this shows the input mode.">
+	Belgian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_BULGARIA" desc="In the language menu button, this shows the input mode.">
+	Bulgarian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_SWITZERLAND" desc="In the language menu button, this shows the input mode.">
+	Swiss keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_TURKEY" desc="In the language menu button, this shows the input mode.">
+	Turkish keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_PORTUGAL" desc="In the language menu button, this shows the input mode.">
+	Portugese keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_SPAIN" desc="In the language menu button, this shows the input mode.">
+	Spainish keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_FINLAND" desc="In the language menu button, this shows the input mode.">
+	Finnish keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_UKRAINE" desc="In the language menu button, this shows the input mode.">
+	Ukrainian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_SPAIN_CATALAN" desc="In the language menu button, this shows the input mode.">
+	Spainish (Catalan) keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_FRANCE" desc="In the language menu button, this shows the input mode.">
+	French keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_NORWAY" desc="In the language menu button, this shows the input mode.">
+	Norwegian keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_SWEDEN" desc="In the language menu button, this shows the input mode.">
+	Swedish keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_NETHERLANDS" desc="In the language menu button, this shows the input mode.">
+	Dutch keyboard layout
+      </message>
+      <message name="IDS_STATUSBAR_LAYOUT_LATVIA" desc="In the language menu button, this shows the input mode.">
+	Latvian keyboard layout
+      </message>
+
       <message name="IDS_COMPACT_NAVBAR" desc="The menu item on the app menu to toggle compact navigation bar">
         Toggle Compact Navigation Bar
       </message>
diff --git a/chrome/browser/chromeos/status/language_menu_l10n_util.cc b/chrome/browser/chromeos/status/language_menu_l10n_util.cc
index 3a420f9..520f452 100644
--- a/chrome/browser/chromeos/status/language_menu_l10n_util.cc
+++ b/chrome/browser/chromeos/status/language_menu_l10n_util.cc
@@ -42,6 +42,8 @@ const struct EnglishToResouceId {
   { "kbd (m17n)", IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_STANDARD_INPUT_METHOD },
   { "itrans (m17n)",  // also uses the "STANDARD_INPUT_METHOD" id.
     IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_STANDARD_INPUT_METHOD },
+  { "quick (m17n)",
+    IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_CHINESE_QUICK_INPUT_METHOD },
   { "isiri (m17n)",
     IDS_OPTIONS_SETTINGS_LANGUAGES_M17N_PERSIAN_ISIRI_2901_INPUT_METHOD },
   { "kesmanee (m17n)",
@@ -74,7 +76,43 @@ const struct EnglishToResouceId {
   { "Google Japanese Input (Japanese keyboard layout)",
     IDS_OPTIONS_SETTINGS_LANGUAGES_JAPANESE_GOOGLE_JP_INPUT_METHOD },
   { "Korean", IDS_OPTIONS_SETTINGS_LANGUAGES_KOREAN_INPUT_METHOD },
-  // TODO(yusukes): Support input methods in the ibus-xkb-layouts engine.
+
+  // For ibus-xkb-layouts engine: third_party/ibus-xkb-layouts/files
+  { "Japan", IDS_STATUSBAR_LAYOUT_JAPAN },
+  { "Slovenia", IDS_STATUSBAR_LAYOUT_SLOVENIA },
+  { "Germany", IDS_STATUSBAR_LAYOUT_GERMANY },
+  { "Italy", IDS_STATUSBAR_LAYOUT_ITALY },
+  { "Estonia", IDS_STATUSBAR_LAYOUT_ESTONIA },
+  { "Hungary", IDS_STATUSBAR_LAYOUT_HUNGARY },
+  { "Poland", IDS_STATUSBAR_LAYOUT_POLAND },
+  { "Denmark", IDS_STATUSBAR_LAYOUT_DENMARK },
+  { "Croatia", IDS_STATUSBAR_LAYOUT_CROATIA },
+  { "Brazil", IDS_STATUSBAR_LAYOUT_BRAZIL },
+  { "Serbia", IDS_STATUSBAR_LAYOUT_SERBIA },
+  { "Czechia", IDS_STATUSBAR_LAYOUT_CZECHIA },
+  { "USA - Dvorak", IDS_STATUSBAR_LAYOUT_USA_DVORAK },
+  { "Romania", IDS_STATUSBAR_LAYOUT_ROMANIA },
+  { "USA", IDS_STATUSBAR_LAYOUT_USA },
+  { "Lithuania", IDS_STATUSBAR_LAYOUT_LITHUANIA },
+  { "United Kingdom", IDS_STATUSBAR_LAYOUT_UNITED_KINGDOM },
+  { "Slovakia", IDS_STATUSBAR_LAYOUT_SLOVAKIA },
+  { "Russia", IDS_STATUSBAR_LAYOUT_RUSSIA },
+  { "Greece", IDS_STATUSBAR_LAYOUT_GREECE },
+  { "Belgium", IDS_STATUSBAR_LAYOUT_BELGIUM },
+  { "Bulgaria", IDS_STATUSBAR_LAYOUT_BULGARIA },
+  { "Switzerland", IDS_STATUSBAR_LAYOUT_SWITZERLAND },
+  { "Turkey", IDS_STATUSBAR_LAYOUT_TURKEY },
+  { "Portugal", IDS_STATUSBAR_LAYOUT_PORTUGAL },
+  { "Spain", IDS_STATUSBAR_LAYOUT_SPAIN },
+  { "Finland", IDS_STATUSBAR_LAYOUT_FINLAND },
+  { "Ukraine", IDS_STATUSBAR_LAYOUT_UKRAINE },
+  { "Spain - Catalan variant with middle-dot L",
+    IDS_STATUSBAR_LAYOUT_SPAIN_CATALAN },
+  { "France", IDS_STATUSBAR_LAYOUT_FRANCE },
+  { "Norway", IDS_STATUSBAR_LAYOUT_NORWAY },
+  { "Sweden", IDS_STATUSBAR_LAYOUT_SWEDEN },
+  { "Netherlands", IDS_STATUSBAR_LAYOUT_NETHERLANDS },
+  { "Latvia", IDS_STATUSBAR_LAYOUT_LATVIA },
 };
 const size_t kNumEntries = arraysize(kEnglishToResourceIdArray);