From 2c25c7c9e1c98feaa3fc739244badacfa0719576 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Sat, 14 Dec 2013 12:13:20 +0900 Subject: [PATCH] Fix locale names in the make-keyboard-text tool Change-Id: I33c3fafcff124bb94e395cc604ce264daad55d2d --- java/res/xml/method.xml | 48 +++++++++---------- .../keyboard/internal/KeyboardTextsSet.java | 12 ++--- .../donottranslate-more-keys.xml | 0 .../donottranslate-more-keys.xml | 0 4 files changed, 30 insertions(+), 30 deletions(-) rename tools/make-keyboard-text/res/{values-az => values-az-rAZ}/donottranslate-more-keys.xml (100%) rename tools/make-keyboard-text/res/{values-ne => values-ne-rNP}/donottranslate-more-keys.xml (100%) diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index 78e771fda..c8e3c198e 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -24,54 +24,54 @@ keyboard_locale: script_name/keyboard_layout_set af: Afrikaans/qwerty ar: Arabic/arabic - (az: Azerbaijani/qwerty) # disabled temporarily. waiting for string resources. - be_BY: Belarusian/east_slavic + (az_AZ: Azerbaijani (Azerbaijan)/qwerty) # disabled temporarily. waiting for string resources. + be_BY: Belarusian (Belarus)/east_slavic bg: Bulgarian/bulgarian bg: Bulgarian/bulgarian_bds ca: Catalan/spanish cs: Czech/qwertz da: Danish/nordic de: German/qwertz - de_CH: German Switzerland/swiss + de_CH: German (Switzerland)/swiss el: Greek/greek - en_US: English United States/qwerty - en_GB: English Great Britain/qwerty + en_US: English (United States)/qwerty + en_GB: English (Great Britain)/qwerty eo: Esperanto/spanish es: Spanish/spanish - es_US: Spanish United States/spanish - (es_419: Spanish Latin America/qwerty) - et_EE: Estonian/nordic + es_US: Spanish (United States)/spanish + (es_419: Spanish (Latin America)/qwerty) + et_EE: Estonian (Estonia)/nordic fa: Persian/arabic fi: Finnish/nordic fr: French/azerty - fr_CA: French Canada/qwerty - fr_CH: French Switzerland/swiss + fr_CA: French (Canada)/qwerty + fr_CH: French (Switzerland)/swiss hi: Hindi/hindi hr: Croatian/qwertz hu: Hungarian/qwertz - hy_AM: Armenian Phonetic/armenian_phonetic + hy_AM: Armenian (Armenia) Phonetic/armenian_phonetic in: Indonesian/qwerty # "id" is official language code of Indonesian. is: Icelandic/qwerty it: Italian/qwerty iw: Hebrew/hebrew # "he" is official language code of Hebrew. - ka_GE: Georgian/georgian + ka_GE: Georgian (Georgia)/georgian (kk: Kazakh/east_slavic) # disabled temporarily. waiting for string resources. - km_KH: Khmer/khmer + km_KH: Khmer (Cambodia)/khmer ky: Kyrgyz/east_slavic - lo_LA: Lao/lao + lo_LA: Lao (Laos)/lao lt: Lithuanian/qwerty lv: Latvian/qwerty mk: Macedonian/south_slavic - mn_MN: Mongolian/mongolian - ms_MY: Malay/qwerty + mn_MN: Mongolian (Mongolia)/mongolian + ms_MY: Malay (Malaysia)/qwerty nb: Norwegian Bokmål/nordic - (ne: Nepali Romanized/nepali_romanized) # disabled temporarily - (ne: Nepali Traditional/nepali_traditional) # disabled temporarily + (ne_NP: Nepali (Nepal) Romanized/nepali_romanized) # disabled temporarily + (ne_NP: Nepali (Nepal) Traditional/nepali_traditional) # disabled temporarily nl: Dutch/qwerty - nl_BE: Dutch Belgium/azerty + nl_BE: Dutch (Belgium)/azerty pl: Polish/qwerty - pt_BR: Portuguese Brazil/qwerty - pt_PT: Portuguese Portugal/qwerty + pt_BR: Portuguese (Brazil)/qwerty + pt_PT: Portuguese (Portugal)/qwerty ro: Romanian/qwerty ru: Russian/east_slavic sk: Slovak/qwerty @@ -135,7 +135,7 @@