diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml index 55f4a661d..d6bb40233 100644 --- a/java/res/values-cs/strings.xml +++ b/java/res/values-cs/strings.xml @@ -127,7 +127,6 @@ ".org" ".net" ".eu" - "Metoda zadávání dat" "Vstupní jazyky" "Jazyk můžete změnit posunutím prstu po mezerníku." "← Uložte slovo opětovným klepnutím" diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml index dbadd930b..8028286bb 100644 --- a/java/res/values-da/strings.xml +++ b/java/res/values-da/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Inputmetode" "Inputsprog" "Træk fingeren på mellemrumstasten for at skifte sprog" "← Tast igen for at gemme" diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml index 7147adca3..f46b9b82f 100644 --- a/java/res/values-de/strings.xml +++ b/java/res/values-de/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Eingabemethode" "Eingabesprachen" "Finger über die Leertaste bewegen, um die Eingabesprache zu wechseln" "← Zum Speichern erneut tippen" diff --git a/java/res/values-el/strings.xml b/java/res/values-el/strings.xml index b53301c3f..7cdd8278e 100644 --- a/java/res/values-el/strings.xml +++ b/java/res/values-el/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Μέθοδος εισόδου" "Γλώσσες εισόδου" "Σύρετε το δάχτυλο στο πλήκτρο διαστήματος για να αλλάξετε γλώσσα" "← Πατήστε ξανά για αποθήκευση" diff --git a/java/res/values-es-rUS/strings.xml b/java/res/values-es-rUS/strings.xml index 9244e71f9..88185b557 100644 --- a/java/res/values-es-rUS/strings.xml +++ b/java/res/values-es-rUS/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Método de entrada" "Idiomas de entrada" "Deslizarse manualmente por la barra espaciadora para cambiar el idioma" "← Presionar nuevamente para guardar" diff --git a/java/res/values-es/strings.xml b/java/res/values-es/strings.xml index 4f9d45b3a..70539414f 100644 --- a/java/res/values-es/strings.xml +++ b/java/res/values-es/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Método de introducción de texto" "Idiomas" "Deslizar el dedo por la barra espaciadora para cambiar el idioma" "← Volver a tocar para guardar" diff --git a/java/res/values-fr/strings.xml b/java/res/values-fr/strings.xml index a3e419594..0c267aaff 100644 --- a/java/res/values-fr/strings.xml +++ b/java/res/values-fr/strings.xml @@ -127,7 +127,6 @@ ".org" ".gouv" ".edu" - "Mode de saisie" "Langues de saisie" "Faites glisser votre doigt sur la barre d\'espacement pour changer la langue." "← Appuyer de nouveau pour enregistrer" diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml index 7c42fa467..0624ec478 100644 --- a/java/res/values-it/strings.xml +++ b/java/res/values-it/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Metodo inserimento" "Lingue comandi" "Scorri il dito sulla barra spaziatrice per cambiare la lingua" "← Tocca di nuovo per salvare" diff --git a/java/res/values-ja/strings.xml b/java/res/values-ja/strings.xml index 06923899d..8e6508c5f 100644 --- a/java/res/values-ja/strings.xml +++ b/java/res/values-ja/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "入力方法" "入力言語" "スペースバーで指をスライドさせて言語を変更する" "←保存するにはもう一度タップ" diff --git a/java/res/values-ko/strings.xml b/java/res/values-ko/strings.xml index 9dfd3efa5..6f9643c3d 100644 --- a/java/res/values-ko/strings.xml +++ b/java/res/values-ko/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "입력 방법" "입력 언어" "손가락을 스페이스바에서 미끄러지듯 움직여 언어 변경" "← 저장하려면 다시 누르세요." diff --git a/java/res/values-nb/strings.xml b/java/res/values-nb/strings.xml index debc644f9..b74506227 100644 --- a/java/res/values-nb/strings.xml +++ b/java/res/values-nb/strings.xml @@ -127,7 +127,6 @@ ".net" ".org" ".info" - "Inndatametode" "Inndataspråk" "Dra fingeren på mellomromstasten for å endre språk" "← Trykk på nytt for å lagre" diff --git a/java/res/values-nl/strings.xml b/java/res/values-nl/strings.xml index 542a1846a..164a65b51 100644 --- a/java/res/values-nl/strings.xml +++ b/java/res/values-nl/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Invoermethode" "Invoertalen" "Schuif uw vinger over de spatiebalk om de taal te wijzigen" "← Tik nogmaals om op te slaan" diff --git a/java/res/values-pl/strings.xml b/java/res/values-pl/strings.xml index ac9d06f29..7c0252d93 100644 --- a/java/res/values-pl/strings.xml +++ b/java/res/values-pl/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Metoda wprowadzania" "Języki wprowadzania" "Przesuń palcem po spacji, aby zmienić język" "← Dotknij ponownie, aby zapisać" diff --git a/java/res/values-pt-rPT/strings.xml b/java/res/values-pt-rPT/strings.xml index 4c6a2ceb0..13871eebe 100644 --- a/java/res/values-pt-rPT/strings.xml +++ b/java/res/values-pt-rPT/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Método de entrada" "Idiomas de entrada" "Deslize o dedo pela barra de espaço para alterar o idioma" "← Toque novamente para guardar" diff --git a/java/res/values-pt/strings.xml b/java/res/values-pt/strings.xml index 14d519921..7defaee85 100644 --- a/java/res/values-pt/strings.xml +++ b/java/res/values-pt/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Método de entrada" "Idiomas de entrada" "Deslize o dedo na barra de espaços para alterar o idioma" "← Toque novamente para salvar" diff --git a/java/res/values-rm/strings.xml b/java/res/values-rm/strings.xml index c32a2efa9..066f72ab6 100644 --- a/java/res/values-rm/strings.xml +++ b/java/res/values-rm/strings.xml @@ -129,7 +129,6 @@ ".org" ".gov" ".edu" - "Metoda d\'endataziun" "Linguas da cumonds vocals" "Stritgar cun il det sur la tasta da vid per midar la lingua" "← Tippar danovamain per memorisar" diff --git a/java/res/values-ru/strings.xml b/java/res/values-ru/strings.xml index 448c8e2ad..0d3aed39f 100644 --- a/java/res/values-ru/strings.xml +++ b/java/res/values-ru/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Способ ввода" "Языки ввода" "Для изменения языка проведите пальцем по пробелу" "← Нажмите повторно, чтобы сохранить" diff --git a/java/res/values-sr/strings.xml b/java/res/values-sr/strings.xml index f706ebc3d..4da1c05b0 100644 --- a/java/res/values-sr/strings.xml +++ b/java/res/values-sr/strings.xml @@ -286,9 +286,6 @@ ".edu" - - Метод за унос - Језици за унос diff --git a/java/res/values-sv/strings.xml b/java/res/values-sv/strings.xml index 2df9c696f..d56c370b7 100644 --- a/java/res/values-sv/strings.xml +++ b/java/res/values-sv/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Indatametod" "Inmatningsspråk" "Dra med fingret på blanksteg om du vill ändra språk" "← Peka igen för att spara" diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml index fb48fb02b..32f357f82 100644 --- a/java/res/values-tr/strings.xml +++ b/java/res/values-tr/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "Giriş yöntemi" "Giriş dilleri" "Dili değiştirmek için parmağınızı boşluk çubuğu üzerinde kaydırın" "← Kaydetmek için tekrar dokunun" diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml index d38490c4d..373cee4ae 100644 --- a/java/res/values-zh-rCN/strings.xml +++ b/java/res/values-zh-rCN/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "输入法" "输入语言" "在空格键上滑动手指可更改语言" "← 再次点按即可保存" diff --git a/java/res/values-zh-rTW/strings.xml b/java/res/values-zh-rTW/strings.xml index 6a6f37efb..77c41e832 100644 --- a/java/res/values-zh-rTW/strings.xml +++ b/java/res/values-zh-rTW/strings.xml @@ -127,7 +127,6 @@ ".org" ".gov" ".edu" - "輸入方式" "輸入語言" "以手指在空白鍵上滑動可變更語言" "← 再次輕按可儲存" diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 456151b62..3df32e47f 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -22,6 +22,8 @@ Android keyboard Android keyboard settings + + Input options Vibrate on keypress @@ -318,9 +320,6 @@ ".edu" - - Input method - Select input method diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 229e13b8f..ddfcaa9e3 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -150,8 +150,8 @@ public class LatinIME extends InputMethodService static final int KEYCODE_PERIOD = '.'; // Contextual menu positions - private static final int POS_SETTINGS = 0; - private static final int POS_METHOD = 1; + private static final int POS_METHOD = 0; + private static final int POS_SETTINGS = 1; //private LatinKeyboardView mInputView; private LinearLayout mCandidateViewContainer; @@ -2455,7 +2455,7 @@ public class LatinIME extends InputMethodService CharSequence itemSettings = getString(R.string.english_ime_settings); CharSequence itemInputMethod = getString(R.string.selectInputMethod); builder.setItems(new CharSequence[] { - itemSettings, itemInputMethod}, + itemInputMethod, itemSettings}, new DialogInterface.OnClickListener() { public void onClick(DialogInterface di, int position) { @@ -2471,7 +2471,7 @@ public class LatinIME extends InputMethodService } } }); - builder.setTitle(mResources.getString(R.string.english_ime_name)); + builder.setTitle(mResources.getString(R.string.english_ime_input_options)); mOptionsDialog = builder.create(); Window window = mOptionsDialog.getWindow(); WindowManager.LayoutParams lp = window.getAttributes();