Index: chromeos/ime/input_methods.txt |
diff --git a/chromeos/ime/input_methods.txt b/chromeos/ime/input_methods.txt |
index a6c6a685eb0c92d3996867bd17f3500a1a6e95ac..16082565000cba8022bd604cae0bec2844651d3e 100644 |
--- a/chromeos/ime/input_methods.txt |
+++ b/chromeos/ime/input_methods.txt |
@@ -59,52 +59,44 @@ |
# U.S. English |
xkb:us::eng us en-US |
-xkb:us:intl:eng us(intl) en-US |
-xkb:us:altgr-intl:eng us(altgr-intl) en-US |
-xkb:us:dvorak:eng us(dvorak) en-US |
-xkb:us:colemak:eng us(colemak) en-US |
-english-m us en-US |
+xkb:us:intl:eng us(intl) en-US |
+xkb:us:altgr-intl:eng us(altgr-intl) en-US |
+xkb:us:dvorak:eng us(dvorak) en-US |
+xkb:us:colemak:eng us(colemak) en-US |
+english-m us en-US |
# U.S. English entiries have to be above the Dutch entry so that xkb:us:intl:eng |
# will be selected as the default keyboard when the UI language is set to Dutch. |
# Dutch |
-xkb:be::nld be nl |
+xkb:be::nld be nl |
# We don't support xkb:nl::nld. See b/4430951. |
# French |
xkb:fr::fra fr fr |
-xkb:be::fra be fr |
-xkb:ca::fra ca fr |
-xkb:ch:fr:fra ch(fr) fr |
+xkb:be::fra be fr |
+xkb:ca::fra ca fr |
+xkb:ch:fr:fra ch(fr) fr |
xkb:ca:multix:fra ca(multix) fr |
# German |
-xkb:de::ger de de |
-xkb:de:neo:ger de(neo) de |
-xkb:be::ger be de |
-xkb:ch::ger ch de |
+xkb:de::ger de de |
+xkb:de:neo:ger de(neo) de |
+xkb:be::ger be de |
+xkb:ch::ger ch de |
# Japanese |
# |kMozcJaInputMethodIds| in ibus_ui_controller.cc should also be updated when |
# a new Mozc Japanese IME for another keyboard layout is added. |
-xkb:jp::jpn jp ja |
+xkb:jp::jpn jp ja |
# Russian |
-xkb:ru::rus ru ru |
-xkb:ru:phonetic:rus ru(phonetic) ru |
- |
-# Thai |
-m17n:th:kesmanee us th |
-m17n:th:pattachote us th |
-m17n:th:tis820 us th |
+xkb:ru::rus ru ru |
+xkb:ru:phonetic:rus ru(phonetic) ru |
# Traditional Chinese |
m17n:zh:quick us zh-TW |
# Vietnamese |
-m17n:vi:tcvn us vi |
-m17n:vi:telex us vi |
-m17n:vi:viqr us vi |
m17n:vi:vni us vi |
# Note: Since Chrome does not support "get surrounding text" feature yet, |
# Vietnames input methods, except 4 input methods above, in m17n-db should |
@@ -115,93 +107,39 @@ m17n:vi:vni us vi |
mozc-hangul kr(kr104) ko |
xkb:kr:kr104:kor kr(kr104) ko |
-# Arabic |
-m17n:ar:kbd us ar |
-# TODO(yusukes,jshin): Check if we can use ibux-xkb-layouts for Arabic, Hindi, |
-# etc. |
- |
-# Hindi |
-m17n:hi:itrans us hi |
-# Note: the m17n-contrib package has some more Hindi IMEs. |
- |
-# Farsi (Persian) |
-m17n:fa:isiri us fa |
- |
-# Bengali |
-m17n:bn:itrans us bn |
-# TODO(yusukes): Support the following IMEs in m17n-db (unijoy) and |
-# m17n-db-contrib (inscript, probhat). |
-# m17n:bn:unijoy us bn |
-# m17n:bn:inscript us bn |
-# m17n:bn:probhat us bn |
- |
-# Gujarati |
-m17n:gu:itrans us gu |
-# TODO(yusukes): Support the following IMEs in m17n-db-contrib. |
-# m17n:gu:phonetic us gu |
-# m17n:gu:inscript us gu |
- |
-# Malayalam |
-m17n:ml:itrans us ml |
-# TODO(yusukes): Support the following IMEs in m17n-db-contrib. |
-# m17n:ml:inscript us ml |
-# m17n:ml:mozhi us ml |
- |
-# Marathi |
-# Note: m17n:mr:itrans is in m17n-db-contrib. |
-m17n:mr:itrans us mr |
-# TODO(yusukes): Support the following IMEs in m17n-db-contrib. |
-# m17n:mr:phonetic us mr |
-# m17n:mr:inscript us mr |
- |
-# Tamil |
-m17n:ta:phonetic us ta |
-m17n:ta:inscript us ta |
-m17n:ta:tamil99 us ta |
-m17n:ta:itrans us ta |
-m17n:ta:typewriter us ta |
- |
-# Telugu |
-m17n:te:itrans us te |
-# Kannada |
-m17n:kn:itrans us kn |
- |
-# Amharic |
-m17n:am:sera us am |
- |
# Keyboard layouts. |
-xkb:br::por br pt-BR |
-xkb:bg::bul bg bg |
-xkb:bg:phonetic:bul bg(phonetic) bg |
-xkb:ca:eng:eng ca(eng) en-CA |
-xkb:cz::cze cz cs |
-xkb:cz:qwerty:cze cz(qwerty) cs |
-xkb:ee::est ee et |
-xkb:es::spa es es |
-xkb:es:cat:cat es(cat) ca |
-xkb:dk::dan dk da |
-xkb:gr::gre gr el |
-xkb:il::heb il he |
-xkb:latam::spa latam es |
-xkb:lt::lit lt lt |
-xkb:lv:apostrophe:lav lv(apostrophe) lv |
-xkb:hr::scr hr hr |
-xkb:gb:extd:eng gb(extd) en-GB |
-xkb:gb:dvorak:eng gb(dvorak) en-GB |
-xkb:fi::fin fi fi |
-xkb:hu::hun hu hu |
-xkb:it::ita it it |
+xkb:br::por br pt-BR |
+xkb:bg::bul bg bg |
+xkb:bg:phonetic:bul bg(phonetic) bg |
+xkb:ca:eng:eng ca(eng) en-CA |
+xkb:cz::cze cz cs |
+xkb:cz:qwerty:cze cz(qwerty) cs |
+xkb:ee::est ee et |
+xkb:es::spa es es |
+xkb:es:cat:cat es(cat) ca |
+xkb:dk::dan dk da |
+xkb:gr::gre gr el |
+xkb:il::heb il he |
+xkb:latam::spa latam es |
+xkb:lt::lit lt lt |
+xkb:lv:apostrophe:lav lv(apostrophe) lv |
+xkb:hr::scr hr hr |
+xkb:gb:extd:eng gb(extd) en-GB |
+xkb:gb:dvorak:eng gb(dvorak) en-GB |
+xkb:fi::fin fi fi |
+xkb:hu::hun hu hu |
+xkb:it::ita it it |
xkb:is::ice is is |
-xkb:no::nob no nb |
-xkb:pl::pol pl pl |
-xkb:pt::por pt pt-PT |
-xkb:ro::rum ro ro |
-xkb:se::swe se sv |
-xkb:sk::slo sk sk |
-xkb:si::slv si sl |
-xkb:rs::srp rs sr |
-xkb:tr::tur tr tr |
-xkb:ua::ukr ua uk |
+xkb:no::nob no nb |
+xkb:pl::pol pl pl |
+xkb:pt::por pt pt-PT |
+xkb:ro::rum ro ro |
+xkb:se::swe se sv |
+xkb:sk::slo sk sk |
+xkb:si::slv si sl |
+xkb:rs::srp rs sr |
+xkb:tr::tur tr tr |
+xkb:ua::ukr ua uk |
xkb:by::bel by be |
xkb:am:phonetic:arm am hy |
xkb:ge::geo ge ka |