aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/raw/main_de.dictbin1605703 -> 1605732 bytes
-rw-r--r--java/res/raw/main_en.dictbin1069006 -> 1068816 bytes
-rw-r--r--java/res/raw/main_fr.dictbin1328012 -> 1328007 bytes
-rw-r--r--java/res/raw/main_it.dictbin1143320 -> 1143310 bytes
-rw-r--r--java/res/values-cs/strings.xml4
-rw-r--r--java/res/values-da/strings.xml21
-rw-r--r--java/res/values-de/strings.xml2
-rw-r--r--java/res/values-en/whitelist.xml113
-rw-r--r--java/res/values-it/strings.xml8
-rw-r--r--java/res/values-sw/strings.xml6
-rw-r--r--java/res/values-tr/strings.xml10
-rw-r--r--java/res/values-zh-rCN/strings.xml12
-rw-r--r--java/res/values/config.xml6
-rw-r--r--java/res/xml-sw600dp/key_apostrophe.xml10
-rw-r--r--java/res/xml-sw600dp/key_dash.xml1
-rw-r--r--java/res/xml-sw600dp/rowkeys_farsi1.xml5
-rw-r--r--java/res/xml-sw600dp/rowkeys_farsi2.xml21
-rw-r--r--java/res/xml-sw600dp/rowkeys_farsi3.xml17
-rw-r--r--java/res/xml-sw600dp/rowkeys_symbols2.xml36
-rw-r--r--java/res/xml-sw600dp/rows_farsi.xml2
-rw-r--r--java/res/xml-sw768dp/rows_farsi.xml2
-rw-r--r--java/res/xml/key_styles_currency.xml11
-rw-r--r--java/res/xml/keys_less_greater.xml34
-rw-r--r--java/res/xml/method.xml2
-rw-r--r--java/res/xml/prefs.xml13
-rw-r--r--java/res/xml/rowkeys_farsi1.xml47
-rw-r--r--java/res/xml/rowkeys_farsi2.xml19
-rw-r--r--java/res/xml/rowkeys_farsi3.xml23
-rw-r--r--java/res/xml/rowkeys_symbols2.xml26
-rw-r--r--java/res/xml/rowkeys_symbols3.xml30
30 files changed, 324 insertions, 157 deletions
diff --git a/java/res/raw/main_de.dict b/java/res/raw/main_de.dict
index 1a7b305d6..6122cd3f0 100644
--- a/java/res/raw/main_de.dict
+++ b/java/res/raw/main_de.dict
Binary files differ
diff --git a/java/res/raw/main_en.dict b/java/res/raw/main_en.dict
index 516e7d51c..98a9361b5 100644
--- a/java/res/raw/main_en.dict
+++ b/java/res/raw/main_en.dict
Binary files differ
diff --git a/java/res/raw/main_fr.dict b/java/res/raw/main_fr.dict
index 17920f0b2..717078c93 100644
--- a/java/res/raw/main_fr.dict
+++ b/java/res/raw/main_fr.dict
Binary files differ
diff --git a/java/res/raw/main_it.dict b/java/res/raw/main_it.dict
index 00bbdbe90..82579078c 100644
--- a/java/res/raw/main_it.dict
+++ b/java/res/raw/main_it.dict
Binary files differ
diff --git a/java/res/values-cs/strings.xml b/java/res/values-cs/strings.xml
index ffe2b2b3b..7e6ee0b4a 100644
--- a/java/res/values-cs/strings.xml
+++ b/java/res/values-cs/strings.xml
@@ -142,10 +142,10 @@
<string name="save" msgid="7646738597196767214">"Uložit"</string>
<string name="subtype_locale" msgid="8576443440738143764">"Jazyk"</string>
<string name="keyboard_layout_set" msgid="4309233698194565609">"Rozvržení"</string>
- <string name="custom_input_style_note_message" msgid="8826731320846363423">"Vlastní styl vstupu musíte nejdříve povolit. Povolit?"</string>
+ <string name="custom_input_style_note_message" msgid="8826731320846363423">"Vlastní styl zadávání musíte nejdříve povolit. Povolit?"</string>
<string name="enable" msgid="5031294444630523247">"Povolit"</string>
<string name="not_now" msgid="6172462888202790482">"Teď ne"</string>
- <string name="custom_input_style_already_exists" msgid="8008728952215449707">"Stejný styl vstupu již existuje: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
+ <string name="custom_input_style_already_exists" msgid="8008728952215449707">"Tento styl zadávání již existuje: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Režim studie použitelnosti"</string>
<string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Délka vibrace při stisku klávesy"</string>
<string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Hlasitost při stisknutí klávesy"</string>
diff --git a/java/res/values-da/strings.xml b/java/res/values-da/strings.xml
index 99ceca2ee..c6800a952 100644
--- a/java/res/values-da/strings.xml
+++ b/java/res/values-da/strings.xml
@@ -24,8 +24,7 @@
<string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android-tastatur (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android-tastatur-indstillinger"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"Indstillinger for input"</string>
- <!-- no translation found for english_ime_research_log (8492602295696577851) -->
- <skip />
+ <string name="english_ime_research_log" msgid="8492602295696577851">"Forskningslogkommandoer"</string>
<string name="spell_checker_service_name" msgid="7338064335159755926">"Android-stavekontrol"</string>
<string name="aosp_spell_checker_service_name" msgid="6985142605330377819">"Android-stavekontrol (AOSP)"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"Indstillinger for stavekontrol"</string>
@@ -113,18 +112,12 @@
<string name="voice_input_modes_summary_off" msgid="63875609591897607">"Stemmeinput deaktiveret"</string>
<string name="configure_input_method" msgid="373356270290742459">"Konfigurer inputmetoder"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Inputsprog"</string>
- <!-- no translation found for note_timestamp_for_researchlog (1889446857977976026) -->
- <skip />
- <!-- no translation found for notify_recorded_timestamp (8036429032449612051) -->
- <skip />
- <!-- no translation found for do_not_log_this_session (413762473641146336) -->
- <skip />
- <!-- no translation found for notify_session_log_deleting (3299507647764414623) -->
- <skip />
- <!-- no translation found for notify_session_log_deleted (8687927130100934686) -->
- <skip />
- <!-- no translation found for notify_session_log_not_deleted (2592908998810755970) -->
- <skip />
+ <string name="note_timestamp_for_researchlog" msgid="1889446857977976026">"Notér tidsstempel i log"</string>
+ <string name="notify_recorded_timestamp" msgid="8036429032449612051">"Noteret tidsstempel"</string>
+ <string name="do_not_log_this_session" msgid="413762473641146336">"Logfør ikke denne session"</string>
+ <string name="notify_session_log_deleting" msgid="3299507647764414623">"Sletter sessionslogfil"</string>
+ <string name="notify_session_log_deleted" msgid="8687927130100934686">"Sessionslogfil slettet"</string>
+ <string name="notify_session_log_not_deleted" msgid="2592908998810755970">"Sessionslog IKKE slettet"</string>
<string name="select_language" msgid="3693815588777926848">"Inputsprog"</string>
<string name="hint_add_to_dictionary" msgid="573678656946085380">"Tryk igen for at gemme"</string>
<string name="has_dictionary" msgid="6071847973466625007">"Ordbog er tilgængelig"</string>
diff --git a/java/res/values-de/strings.xml b/java/res/values-de/strings.xml
index 5ddd309c4..cd2d78e4a 100644
--- a/java/res/values-de/strings.xml
+++ b/java/res/values-de/strings.xml
@@ -115,7 +115,7 @@
<string name="note_timestamp_for_researchlog" msgid="1889446857977976026">"Zeitstempel im Protokoll"</string>
<string name="notify_recorded_timestamp" msgid="8036429032449612051">"Zeitstempel aufgenommen"</string>
<string name="do_not_log_this_session" msgid="413762473641146336">"Nicht protokollieren"</string>
- <string name="notify_session_log_deleting" msgid="3299507647764414623">"Protokoll wird gelöscht"</string>
+ <string name="notify_session_log_deleting" msgid="3299507647764414623">"Protokoll wird gelöscht..."</string>
<string name="notify_session_log_deleted" msgid="8687927130100934686">"Protokoll gelöscht"</string>
<string name="notify_session_log_not_deleted" msgid="2592908998810755970">"Protokoll NICHT gelöscht"</string>
<string name="select_language" msgid="3693815588777926848">"Eingabesprachen"</string>
diff --git a/java/res/values-en/whitelist.xml b/java/res/values-en/whitelist.xml
index 9612aac5d..262017916 100644
--- a/java/res/values-en/whitelist.xml
+++ b/java/res/values-en/whitelist.xml
@@ -30,7 +30,6 @@
<item>ill</item>
<item>I\'ll</item>
- <!-- Following entries came from AutoText the Android keyboard no longer uses. -->
<!-- TODO: Trim down more entries by removing ones that get auto-corrected by the
Android keyboard's own typing error correction algorithms. -->
@@ -63,22 +62,62 @@
<item>been</item>
<item>255</item>
+ <item>bot</item>
+ <item>not</item>
+
+ <item>255</item>
<item>bur</item>
<item>but</item>
<item>255</item>
+ <item>cam</item>
+ <item>can</item>
+
+ <item>255</item>
<item>cant</item>
<item>can\'t</item>
<item>255</item>
+ <item>dame</item>
+ <item>same</item>
+
+ <item>255</item>
<item>didint</item>
<item>didn\'t</item>
<item>255</item>
+ <item>dormer</item>
+ <item>former</item>
+
+ <item>255</item>
+ <item>dud</item>
+ <item>did</item>
+
+ <item>255</item>
+ <item>fay</item>
+ <item>day</item>
+
+ <item>255</item>
+ <item>fife</item>
+ <item>five</item>
+
+ <item>255</item>
+ <item>foo</item>
+ <item>for</item>
+
+ <item>255</item>
<item>fora</item>
<item>for a</item>
<item>255</item>
+ <item>galled</item>
+ <item>called</item>
+
+ <item>255</item>
+ <item>goo</item>
+ <item>too</item>
+
+ <item>255</item>
<item>hed</item>
<item>he\'d</item>
@@ -91,6 +130,10 @@
<item>here\'s</item>
<item>255</item>
+ <item>hew</item>
+ <item>new</item>
+
+ <item>255</item>
<item>hoe</item>
<item>how</item>
@@ -115,10 +158,18 @@
<item>how\'ve</item>
<item>255</item>
+ <item>hum</item>
+ <item>him</item>
+
+ <item>255</item>
<item>i</item>
<item>I</item>
<item>255</item>
+ <item>ifs</item>
+ <item>its</item>
+
+ <item>255</item>
<item>il</item>
<item>I\'ll</item>
@@ -139,10 +190,6 @@
<item>it\'s a</item>
<item>255</item>
- <item>jot</item>
- <item>not</item>
-
- <item>255</item>
<item>lets</item>
<item>let\'s</item>
@@ -151,6 +198,18 @@
<item>ma\'am</item>
<item>255</item>
+ <item>manu</item>
+ <item>many</item>
+
+ <item>255</item>
+ <item>mare</item>
+ <item>made</item>
+
+ <item>255</item>
+ <item>mew</item>
+ <item>new</item>
+
+ <item>255</item>
<item>mire</item>
<item>more</item>
@@ -171,14 +230,46 @@
<item>notes</item>
<item>255</item>
+ <item>mow</item>
+ <item>now</item>
+
+ <item>255</item>
+ <item>namer</item>
+ <item>named</item>
+
+ <item>255</item>
+ <item>nave</item>
+ <item>have</item>
+
+ <item>255</item>
+ <item>nee</item>
+ <item>new</item>
+
+ <item>255</item>
+ <item>nigh</item>
+ <item>high</item>
+
+ <item>255</item>
<item>nit</item>
<item>not</item>
<item>255</item>
+ <item>oft</item>
+ <item>off</item>
+
+ <item>255</item>
<item>os</item>
<item>is</item>
<item>255</item>
+ <item>pater</item>
+ <item>later</item>
+
+ <item>255</item>
+ <item>rook</item>
+ <item>took</item>
+
+ <item>255</item>
<item>shel</item>
<item>she\'ll</item>
@@ -187,6 +278,14 @@
<item>shouldn\'t</item>
<item>255</item>
+ <item>sill</item>
+ <item>will</item>
+
+ <item>255</item>
+ <item>sown</item>
+ <item>down</item>
+
+ <item>255</item>
<item>thatd</item>
<item>that\'d</item>
@@ -305,10 +404,6 @@
<item>y\'all</item>
<item>255</item>
- <item>yo</item>
- <item>to</item>
-
- <item>255</item>
<item>youd</item>
<item>you\'d</item>
diff --git a/java/res/values-it/strings.xml b/java/res/values-it/strings.xml
index 892abac10..e77a0d04d 100644
--- a/java/res/values-it/strings.xml
+++ b/java/res/values-it/strings.xml
@@ -107,8 +107,8 @@
<string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Su tastiera principale"</string>
<string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Su tastiera simboli"</string>
<string name="voice_input_modes_off" msgid="3745699748218082014">"Non attivo"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Mic su tastiera principale"</string>
- <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Mic su tastiera simboli"</string>
+ <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Microfono su tastiera principale"</string>
+ <string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Microfono su tastiera simboli"</string>
<string name="voice_input_modes_summary_off" msgid="63875609591897607">"Comandi vocali disatt."</string>
<string name="configure_input_method" msgid="373356270290742459">"Configura metodi di immissione"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Lingue comandi"</string>
@@ -147,6 +147,6 @@
<string name="not_now" msgid="6172462888202790482">"Non ora"</string>
<string name="custom_input_style_already_exists" msgid="8008728952215449707">"Esiste già uno stile di inuput uguale: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
<string name="prefs_usability_study_mode" msgid="1261130555134595254">"Modalità Studio sull\'usabilità"</string>
- <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Impostazioni durata vibrazione alla pressione di un tasto"</string>
- <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Impostazioni volume audio alla pressione di un tasto"</string>
+ <string name="prefs_keypress_vibration_duration_settings" msgid="1829950405285211668">"Durata vibrazione alla pressione tasto"</string>
+ <string name="prefs_keypress_sound_volume_settings" msgid="5875933757082305040">"Volume audio alla pressione di un tasto"</string>
</resources>
diff --git a/java/res/values-sw/strings.xml b/java/res/values-sw/strings.xml
index bd3b15052..f416fcd76 100644
--- a/java/res/values-sw/strings.xml
+++ b/java/res/values-sw/strings.xml
@@ -113,8 +113,8 @@
<string name="configure_input_method" msgid="373356270290742459">"Sanidi mbinu za uingizaji"</string>
<string name="language_selection_title" msgid="1651299598555326750">"Lugha za uingizaji"</string>
<string name="note_timestamp_for_researchlog" msgid="1889446857977976026">"Dokeza mhuri wa muda kwenye kumbukumbu"</string>
- <string name="notify_recorded_timestamp" msgid="8036429032449612051">"Mhuri wa muda uliyorekodiwa"</string>
- <string name="do_not_log_this_session" msgid="413762473641146336">"Usifungue kipindi hiki"</string>
+ <string name="notify_recorded_timestamp" msgid="8036429032449612051">"Mhuri wa muda uliorekodiwa"</string>
+ <string name="do_not_log_this_session" msgid="413762473641146336">"Usihifadhi kumbukumbu za kipindi hiki"</string>
<string name="notify_session_log_deleting" msgid="3299507647764414623">"Inafuta kumbukumbu za kipindi"</string>
<string name="notify_session_log_deleted" msgid="8687927130100934686">"Kumbukumbu za kipindi zimefutwa"</string>
<string name="notify_session_log_not_deleted" msgid="2592908998810755970">"Kumbukumbu za kipindi HAZIJAFUTWA"</string>
@@ -142,7 +142,7 @@
<string name="save" msgid="7646738597196767214">"Hifadhi"</string>
<string name="subtype_locale" msgid="8576443440738143764">"Lugha"</string>
<string name="keyboard_layout_set" msgid="4309233698194565609">"Mpangilio"</string>
- <string name="custom_input_style_note_message" msgid="8826731320846363423">"Unaweza kugeuza kukufaa mfumo wako ma maingizo ili kuwezeshwa kabla ya kuanza kuutumia. Unataka kuuwesha sasa?"</string>
+ <string name="custom_input_style_note_message" msgid="8826731320846363423">"Mtindo wa ingizo lako maalum unahitaji kuwa umewezeshwa kabla uanze kulitumia. Unataka kuuwesha sasa?"</string>
<string name="enable" msgid="5031294444630523247">"Wezesha"</string>
<string name="not_now" msgid="6172462888202790482">"Sio sasa"</string>
<string name="custom_input_style_already_exists" msgid="8008728952215449707">"Mfumo sawa wa maingizo tayari upo: <xliff:g id="INPUT_STYLE_NAME">%s</xliff:g>"</string>
diff --git a/java/res/values-tr/strings.xml b/java/res/values-tr/strings.xml
index f8f3c3341..16411b8ed 100644
--- a/java/res/values-tr/strings.xml
+++ b/java/res/values-tr/strings.xml
@@ -41,15 +41,15 @@
<string name="include_other_imes_in_language_switch_list" msgid="4533689960308565519">"Diğer giriş yöntemine geç"</string>
<string name="include_other_imes_in_language_switch_list_summary" msgid="840637129103317635">"Dil geçiş tuşu diğer giriş yöntemlerini de kapsar"</string>
<string name="suppress_language_switch_key" msgid="8003788410354806368">"Dil geçiş tuşunu gösterme"</string>
- <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Tuş popup içn kaptm ertlm"</string>
+ <string name="key_preview_popup_dismiss_delay" msgid="6213164897443068248">"Tuş popup\'ının kapatılmasını geciktirme"</string>
<string name="key_preview_popup_dismiss_no_delay" msgid="2096123151571458064">"Gecikme yok"</string>
<string name="key_preview_popup_dismiss_default_delay" msgid="2166964333903906734">"Varsayılan"</string>
<string name="use_contacts_dict" msgid="4435317977804180815">"Kişi Adları öner"</string>
<string name="use_contacts_dict_summary" msgid="6599983334507879959">"Öneri ve düzeltmeler için Kişiler\'deki adları kullan"</string>
<string name="enable_span_insert" msgid="7204653105667167620">"Düzeltmeleri etkinleştir"</string>
<string name="enable_span_insert_summary" msgid="2947317657871394467">"Yeniden düzeltmeler için önerileri ayarla"</string>
- <string name="auto_cap" msgid="1719746674854628252">"Otomatik olarak büyük harf yap"</string>
- <string name="configure_dictionaries_title" msgid="4238652338556902049">"Ekli sözlükler"</string>
+ <string name="auto_cap" msgid="1719746674854628252">"Otomatik olarak büyük fark yap"</string>
+ <string name="configure_dictionaries_title" msgid="4238652338556902049">"Ek sözlükler"</string>
<string name="main_dictionary" msgid="4798763781818361168">"Ana sözlük"</string>
<string name="prefs_show_suggestions" msgid="8026799663445531637">"Düzeltme önerilerini göster"</string>
<string name="prefs_show_suggestions_summary" msgid="1583132279498502825">"Yazarken, önerilen kelimeleri görüntüle"</string>
@@ -57,7 +57,7 @@
<string name="prefs_suggestion_visibility_show_only_portrait_name" msgid="3551821800439659812">"Dikey modda göster"</string>
<string name="prefs_suggestion_visibility_hide_name" msgid="6309143926422234673">"Her zaman gizle"</string>
<string name="auto_correction" msgid="4979925752001319458">"Otomatik düzeltme"</string>
- <string name="auto_correction_summary" msgid="5625751551134658006">"Boşluk çbğ ve nokt işr yanlış yazılan kelimeleri oto düzeltir"</string>
+ <string name="auto_correction_summary" msgid="5625751551134658006">"Boşluk tuşu ve noktalama işaretleri yanlış yazılan kelimeleri otomatikman düzeltir"</string>
<string name="auto_correction_threshold_mode_off" msgid="8470882665417944026">"Kapalı"</string>
<string name="auto_correction_threshold_mode_modest" msgid="8788366690620799097">"Ölçülü"</string>
<string name="auto_correction_threshold_mode_aggeressive" msgid="3524029103734923819">"Agresif"</string>
@@ -107,7 +107,7 @@
<string name="voice_input_modes_main_keyboard" msgid="3360660341121083174">"Ana klavyede"</string>
<string name="voice_input_modes_symbols_keyboard" msgid="7203213240786084067">"Simge klavyesinde"</string>
<string name="voice_input_modes_off" msgid="3745699748218082014">"Kapalı"</string>
- <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Ana klavyede mikrfn"</string>
+ <string name="voice_input_modes_summary_main_keyboard" msgid="6586544292900314339">"Ana klavyedeki mikrofon"</string>
<string name="voice_input_modes_summary_symbols_keyboard" msgid="5233725927281932391">"Simge klavysnd mikrf"</string>
<string name="voice_input_modes_summary_off" msgid="63875609591897607">"Sesle grş devre dışı"</string>
<string name="configure_input_method" msgid="373356270290742459">"Giriş yöntemlerini yapılandır"</string>
diff --git a/java/res/values-zh-rCN/strings.xml b/java/res/values-zh-rCN/strings.xml
index f5e38f935..4907f202f 100644
--- a/java/res/values-zh-rCN/strings.xml
+++ b/java/res/values-zh-rCN/strings.xml
@@ -24,7 +24,7 @@
<string name="aosp_android_keyboard_ime_name" msgid="7877134937939182296">"Android 键盘 (AOSP)"</string>
<string name="english_ime_settings" msgid="6661589557206947774">"Android 键盘设置"</string>
<string name="english_ime_input_options" msgid="3909945612939668554">"输入选项"</string>
- <string name="english_ime_research_log" msgid="8492602295696577851">"探究日志命令"</string>
+ <string name="english_ime_research_log" msgid="8492602295696577851">"研究记录命令"</string>
<string name="spell_checker_service_name" msgid="7338064335159755926">"Android 拼写检查工具"</string>
<string name="aosp_spell_checker_service_name" msgid="6985142605330377819">"Android 拼写检查工具 (AOSP)"</string>
<string name="android_spell_checker_settings" msgid="5822324635435443689">"拼写检查设置"</string>
@@ -112,12 +112,12 @@
<string name="voice_input_modes_summary_off" msgid="63875609591897607">"语音输入功能已停用"</string>
<string name="configure_input_method" msgid="373356270290742459">"配置输入法"</string>
<string name="language_selection_title" msgid="1651299598555326750">"输入语言"</string>
- <string name="note_timestamp_for_researchlog" msgid="1889446857977976026">"在日志中记上时间"</string>
- <string name="notify_recorded_timestamp" msgid="8036429032449612051">"已记录时间"</string>
+ <string name="note_timestamp_for_researchlog" msgid="1889446857977976026">"标记记录中的时间"</string>
+ <string name="notify_recorded_timestamp" msgid="8036429032449612051">"已标记时间"</string>
<string name="do_not_log_this_session" msgid="413762473641146336">"不记录本次会话"</string>
- <string name="notify_session_log_deleting" msgid="3299507647764414623">"正在删除会话日志"</string>
- <string name="notify_session_log_deleted" msgid="8687927130100934686">"会话日志已删除"</string>
- <string name="notify_session_log_not_deleted" msgid="2592908998810755970">"未能删除会话日志"</string>
+ <string name="notify_session_log_deleting" msgid="3299507647764414623">"正在删除会话记录"</string>
+ <string name="notify_session_log_deleted" msgid="8687927130100934686">"会话记录已删除"</string>
+ <string name="notify_session_log_not_deleted" msgid="2592908998810755970">"未能删除会话记录"</string>
<string name="select_language" msgid="3693815588777926848">"输入语言"</string>
<string name="hint_add_to_dictionary" msgid="573678656946085380">"再次触摸即可保存"</string>
<string name="has_dictionary" msgid="6071847973466625007">"有可用词典"</string>
diff --git a/java/res/values/config.xml b/java/res/values/config.xml
index e20061d7d..589830d8e 100644
--- a/java/res/values/config.xml
+++ b/java/res/values/config.xml
@@ -22,14 +22,10 @@
<bool name="config_use_fullscreen_mode">false</bool>
<bool name="config_enable_show_voice_key_option">true</bool>
<bool name="config_enable_show_popup_on_keypress_option">true</bool>
- <bool name="config_enable_next_word_suggestions_option">true</bool>
<!-- TODO: Disable the following configuration for production. -->
<bool name="config_enable_usability_study_mode_option">true</bool>
<!-- Whether or not Popup on key press is enabled by default -->
<bool name="config_default_popup_preview">true</bool>
- <!-- Default value for next word suggestion: while showing suggestions for a word should we weigh
- in the previous word? -->
- <bool name="config_default_next_word_suggestions">true</bool>
<!-- Default value for next word prediction: after entering a word and a space only, should we look
at input history to suggest a hopefully helpful suggestions for the next word? -->
<bool name="config_default_next_word_prediction">true</bool>
@@ -63,7 +59,7 @@
<integer name="config_long_press_key_timeout">400</integer>
<!-- Long pressing shift will invoke caps-lock if > 0, never invoke caps-lock if == 0 -->
<integer name="config_long_press_shift_key_timeout">1200</integer>
- <integer name="config_ignore_alt_code_key_timeout">700</integer>
+ <integer name="config_ignore_alt_code_key_timeout">350</integer>
<!-- Showing more keys keyboard, just above the touched point if true, aligned to the key if
false -->
<bool name="config_show_more_keys_keyboard_at_touched_point">false</bool>
diff --git a/java/res/xml-sw600dp/key_apostrophe.xml b/java/res/xml-sw600dp/key_apostrophe.xml
index 0c838db56..2aec34729 100644
--- a/java/res/xml-sw600dp/key_apostrophe.xml
+++ b/java/res/xml-sw600dp/key_apostrophe.xml
@@ -28,6 +28,16 @@
<Key
latin:keyLabel="-" />
</case>
+ <case
+ latin:languageCode="fa"
+ >
+ <Key
+ latin:keyLabel="!text/keylabel_for_apostrophe"
+ latin:keyHintLabel="!text/keyhintlabel_for_apostrophe"
+ latin:keyLabelFlags="hasPopupHint"
+ latin:moreKeys="!text/more_keys_for_apostrophe"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
+ </case>
<default>
<Key
latin:keyLabel="!text/keylabel_for_apostrophe"
diff --git a/java/res/xml-sw600dp/key_dash.xml b/java/res/xml-sw600dp/key_dash.xml
index 118b67f27..b139c29c8 100644
--- a/java/res/xml-sw600dp/key_dash.xml
+++ b/java/res/xml-sw600dp/key_dash.xml
@@ -34,6 +34,7 @@
<Key
latin:keyLabel="."
latin:keyHintLabel="!text/keyhintlabel_for_arabic_diacritics"
+ latin:keyLabelFlags="hasPopupHint"
latin:moreKeys="!text/more_keys_for_arabic_diacritics"
latin:keyStyle="hasShiftedLetterHintStyle" />
</case>
diff --git a/java/res/xml-sw600dp/rowkeys_farsi1.xml b/java/res/xml-sw600dp/rowkeys_farsi1.xml
index ab260a460..53208f286 100644
--- a/java/res/xml-sw600dp/rowkeys_farsi1.xml
+++ b/java/res/xml-sw600dp/rowkeys_farsi1.xml
@@ -45,12 +45,11 @@
<!-- U+0647: "ه" ARABIC LETTER HEH
U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
- U+06C0: "ۀ" ARABIC LETTER HEH WITH YEH ABOVE
+ U+0647/U+0654: ARABIC LETTER HEH + ARABIC HAMZA ABOVE
U+0629: "ة" ARABIC LETTER TEH MARBUTA -->
- <!-- TODO: DroidSansArabic lacks the glyph of U+06C0 ARABIC LETTER HEH WITH YEH ABOVE -->
<Key
latin:keyLabel="&#x0647;"
- latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x06C0;,&#x0629;,%" />
+ latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%" />
<!-- U+062E: "خ" ARABIC LETTER KHAH -->
<Key
latin:keyLabel="&#x062E;" />
diff --git a/java/res/xml-sw600dp/rowkeys_farsi2.xml b/java/res/xml-sw600dp/rowkeys_farsi2.xml
index 98e0f2186..234f98430 100644
--- a/java/res/xml-sw600dp/rowkeys_farsi2.xml
+++ b/java/res/xml-sw600dp/rowkeys_farsi2.xml
@@ -29,10 +29,12 @@
latin:keyLabel="&#x0633;" />
<!-- U+06CC: "ی" ARABIC LETTER FARSI YEH
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
- U+064A: "ي" ARABIC LETTER YEH -->
+ U+064A: "ي" ARABIC LETTER YEH
+ U+FBE8: "ﯨ" ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM
+ U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
<Key
latin:keyLabel="&#x06CC;"
- latin:moreKeys="&#x0626;,&#x064A;" />
+ latin:moreKeys="&#x0626;,&#x064A;,&#xFBE8;|&#x0649;" />
<!-- U+0628: "ب" ARABIC LETTER BEH -->
<Key
latin:keyLabel="&#x0628;" />
@@ -42,17 +44,18 @@
<!-- U+0627: "ا" ARABIC LETTER ALEF
U+0621: "ء" ARABIC LETTER HAMZA
U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE
- U+0672: "ٲ" ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE
+ U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
U+0671: "ٱ" ARABIC LETTER ALEF WASLA
- U+0673: "ٳ" ARABIC LETTER ALEF WITH WAVY HAMZA BELOW-->
- <!-- TODO: DroidSansArabic lacks the glyph of U+0672 ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE -->
- <!-- TODO: DroidSansArabic lacks the glyph of U+0673 ARABIC LETTER ALEF WITH WAVY HAMZA BELOW -->
+ U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW -->
<Key
latin:keyLabel="&#x0627;"
- latin:moreKeys="&#x0621;,&#x0622;,&#x0672;,&#x0671;,&#x0673;" />
- <!-- U+062A: "ت" ARABIC LETTER TEH -->
+ latin:moreKeys="&#x0621;,&#x0622;,&#x0623;,&#x0671;,&#x0625;" />
+ <!-- U+062A: "ت" ARABIC LETTER TEH
+ U+062B: "ﺙ" ARABIC LETTER THEH
+ U+0629: "ة": ARABIC LETTER TEH MARBUTA -->
<Key
- latin:keyLabel="&#x062A;" />
+ latin:keyLabel="&#x062A;"
+ latin:moreKeys="&#x062B;,&#x0629;" />
<!-- U+0646: "ن" ARABIC LETTER NOON -->
<Key
latin:keyLabel="&#x0646;" />
diff --git a/java/res/xml-sw600dp/rowkeys_farsi3.xml b/java/res/xml-sw600dp/rowkeys_farsi3.xml
index c80c14a55..998ba72d6 100644
--- a/java/res/xml-sw600dp/rowkeys_farsi3.xml
+++ b/java/res/xml-sw600dp/rowkeys_farsi3.xml
@@ -27,11 +27,12 @@
<!-- U+0637: "ط" ARABIC LETTER TAH -->
<Key
latin:keyLabel="&#x0637;" />
- <!-- U+0632: "ز" ARABIC LETTER ZAIN
- U+0698: "ژ" ARABIC LETTER JEH -->
+ <!-- U+0698: "ژ" ARABIC LETTER JEH -->
<Key
- latin:keyLabel="&#x0632;"
- latin:moreKeys="&#x0698;" />
+ latin:keyLabel="&#x0698;" />
+ <!-- U+0632: "ز" ARABIC LETTER ZAIN -->
+ <Key
+ latin:keyLabel="&#x0632;" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
latin:keyLabel="&#x0631;" />
@@ -45,9 +46,11 @@
<Key
latin:keyLabel="&#x067E;" />
<!-- U+0648: "و" ARABIC LETTER WAW
- U+0676: "ٶ" ARABIC LETTER HIGH HAMZA WAW -->
- <!-- TODO: DroidSansArabic lacks the glyph of U+0676 ARABIC LETTER HIGH HAMZA WAW -->
+ U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
<Key
latin:keyLabel="&#x0648;"
- latin:moreKeys="&#x0676;" />
+ latin:moreKeys="&#x0624;" />
+ <!-- U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE -->
+ <Key
+ latin:keyLabel="&#x0622;" />
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_symbols2.xml b/java/res/xml-sw600dp/rowkeys_symbols2.xml
index 6fe86240c..d7067e0cf 100644
--- a/java/res/xml-sw600dp/rowkeys_symbols2.xml
+++ b/java/res/xml-sw600dp/rowkeys_symbols2.xml
@@ -21,15 +21,43 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <Key
- latin:keyLabel="#" />
+ <switch>
+ <case
+ latin:languageCode="fa"
+ >
+ <!-- U+066C: "٬" ARABIC THOUSANDS SEPARATOR -->
+ <Key
+ latin:keyLabel="&#x066C;"
+ latin:keyHintLabel="&amp;"
+ latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
+ latin:moreKeys="&amp;" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel="#" />
+ </default>
+ </switch>
<Key
latin:keyStyle="currencyKeyStyle" />
<Key
latin:keyLabel="!text/keylabel_for_symbols_percent"
latin:moreKeys="!text/more_keys_for_symbols_percent" />
- <Key
- latin:keyLabel="&amp;" />
+ <switch>
+ <case
+ latin:languageCode="fa"
+ >
+ <!-- U+066B: "٫" ARABIC DECIMAL SEPARATOR -->
+ <Key
+ latin:keyLabel="&#x066B;"
+ latin:keyHintLabel="#"
+ latin:keyLabelFlags="hasPopupHint|hasShiftedLetterHint"
+ latin:moreKeys="#" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel="&amp;" />
+ </default>
+ </switch>
<Key
latin:keyLabel="*"
latin:moreKeys="!text/more_keys_for_star" />
diff --git a/java/res/xml-sw600dp/rows_farsi.xml b/java/res/xml-sw600dp/rows_farsi.xml
index 1ce658648..52c2d9329 100644
--- a/java/res/xml-sw600dp/rows_farsi.xml
+++ b/java/res/xml-sw600dp/rows_farsi.xml
@@ -44,8 +44,6 @@
<include
latin:keyboardLayout="@xml/rowkeys_farsi3"
latin:keyXPos="4.091%p" />
- <include
- latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
diff --git a/java/res/xml-sw768dp/rows_farsi.xml b/java/res/xml-sw768dp/rows_farsi.xml
index 28031bb82..4b4c970fd 100644
--- a/java/res/xml-sw768dp/rows_farsi.xml
+++ b/java/res/xml-sw768dp/rows_farsi.xml
@@ -52,8 +52,6 @@
<include
latin:keyboardLayout="@xml/rowkeys_farsi3"
latin:keyXPos="13.829%p" />
- <include
- latin:keyboardLayout="@xml/keys_comma_period" />
<Key
latin:keyStyle="enterKeyStyle"
latin:keyWidth="fillRight" />
diff --git a/java/res/xml/key_styles_currency.xml b/java/res/xml/key_styles_currency.xml
index d5c6a87b9..6dea16f89 100644
--- a/java/res/xml/key_styles_currency.xml
+++ b/java/res/xml/key_styles_currency.xml
@@ -105,6 +105,7 @@
latin:languageCode="fa"
>
<!-- U+FDFC: "﷼" RIAL SIGN
+ U+060B: "؋" AFGHANI SIGN
U+00A3: "£" POUND SIGN
U+20AC: "€" EURO SIGN
U+00A2: "¢" CENT SIGN -->
@@ -112,20 +113,20 @@
<key-style
latin:styleName="currencyKeyStyle"
latin:keyLabel="&#xFDFC;"
- latin:moreKeys="!text/more_keys_for_currency_general" />
+ latin:moreKeys="!text/more_keys_for_currency_general,&#x060B;" />
<key-style
latin:styleName="moreCurrency1KeyStyle"
- latin:keyLabel="£" />
+ latin:keyLabel="&#x00A3;" />
<key-style
latin:styleName="moreCurrency2KeyStyle"
- latin:keyLabel="€" />
+ latin:keyLabel="&#x20AC;" />
<key-style
latin:styleName="moreCurrency3KeyStyle"
latin:keyLabel="$"
- latin:moreKeys="¢" />
+ latin:moreKeys="&#x00A2;" />
<key-style
latin:styleName="moreCurrency4KeyStyle"
- latin:keyLabel="¢" />
+ latin:keyLabel="&#x00A2;" />
</case>
<!-- United Kingdom -->
<case
diff --git a/java/res/xml/keys_less_greater.xml b/java/res/xml/keys_less_greater.xml
index 4584e5c96..bc9ecdf2f 100644
--- a/java/res/xml/keys_less_greater.xml
+++ b/java/res/xml/keys_less_greater.xml
@@ -21,12 +21,30 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <Key
- latin:keyLabel="&lt;"
- latin:code="!code/key_less_than"
- latin:moreKeys="!text/more_keys_for_less_than" />
- <Key
- latin:keyLabel="&gt;"
- latin:code="!code/key_greater_than"
- latin:moreKeys="!text/more_keys_for_greater_than" />
+ <switch>
+ <case
+ latin:languageCode="fa"
+ >
+ <!-- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
+ <Key
+ latin:keyLabel="&#x00AB;"
+ latin:code="0x00BB"
+ latin:moreKeys="!text/more_keys_for_less_than" />
+ <Key
+ latin:keyLabel="&#x00BB;"
+ latin:code="0x00AB"
+ latin:moreKeys="!text/more_keys_for_greater_than" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel="&lt;"
+ latin:code="!code/key_less_than"
+ latin:moreKeys="!text/more_keys_for_less_than" />
+ <Key
+ latin:keyLabel="&gt;"
+ latin:code="!code/key_greater_than"
+ latin:moreKeys="!text/more_keys_for_greater_than" />
+ </default>
+ </switch>
</merge>
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index a0262846b..07bff098b 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -49,7 +49,7 @@
lt: Lithuanian/qwerty
lv: Latvian/qwerty
mk: Macedonian/south_slavic
- nb: Norwaian Bokmål/nordic
+ nb: Norwegian Bokmål/nordic
nl: Dutch/qwerty
pl: Polish/qwerty
pt_BR: Portuguese Brazil/qwerty
diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index 3598a685e..d8bf7847e 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -115,24 +115,11 @@
android:persistent="true"
android:defaultValue="true" />
<CheckBoxPreference
- android:key="next_word_suggestion"
- android:title="@string/bigram_suggestion"
- android:summary="@string/bigram_suggestion_summary"
- android:persistent="true"
- android:defaultValue="true" />
- <CheckBoxPreference
android:key="next_word_prediction"
- android:dependency="next_word_suggestion"
android:title="@string/bigram_prediction"
android:summary="@string/bigram_prediction_summary"
android:persistent="true"
android:defaultValue="true" />
- <CheckBoxPreference
- android:key="enable_span_insert"
- android:title="@string/enable_span_insert"
- android:summary="@string/enable_span_insert_summary"
- android:persistent="true"
- android:defaultValue="true" />
<PreferenceScreen
android:key="pref_vibration_duration_settings"
android:title="@string/prefs_keypress_vibration_duration_settings"/>
diff --git a/java/res/xml/rowkeys_farsi1.xml b/java/res/xml/rowkeys_farsi1.xml
index 15cb80182..840b048f7 100644
--- a/java/res/xml/rowkeys_farsi1.xml
+++ b/java/res/xml/rowkeys_farsi1.xml
@@ -22,69 +22,70 @@
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<!-- U+0635: "ص" ARABIC LETTER SAD
+ U+0636: "ض" ARABIC LETTER DAD
U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->
<Key
latin:keyLabel="&#x0635;"
- latin:keyHintLabel="1"
- latin:additionalMoreKeys="1,&#x06F1;" />
+ latin:moreKeys="&#x0636;,%"
+ latin:keyHintLabel="&#x06F1;"
+ latin:additionalMoreKeys="&#x06F1;,1" />
<!-- U+0642: "ق" ARABIC LETTER QAF
U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO -->
<Key
latin:keyLabel="&#x0642;"
- latin:keyHintLabel="2"
- latin:additionalMoreKeys="2,&#x06F2;" />
+ latin:keyHintLabel="&#x06F2;"
+ latin:additionalMoreKeys="&#x06F2;,2" />
<!-- U+0641: "ف" ARABIC LETTER FEH
U+06F3: "۳" EXTENDED ARABIC-INDIC DIGIT THREE -->
<Key
latin:keyLabel="&#x0641;"
- latin:keyHintLabel="3"
- latin:additionalMoreKeys="3,&#x06F3;" />
+ latin:keyHintLabel="&#x06F3;"
+ latin:additionalMoreKeys="&#x06F3;,3" />
<!-- U+063A: "غ" ARABIC LETTER GHAIN
U+06F4: "۴" EXTENDED ARABIC-INDIC DIGIT FOUR -->
<Key
latin:keyLabel="&#x063A;"
- latin:keyHintLabel="4"
- latin:additionalMoreKeys="4,&#x06F4;" />
+ latin:keyHintLabel="&#x06F4;"
+ latin:additionalMoreKeys="&#x06F4;,4" />
<!-- U+0639: "ع" ARABIC LETTER AIN
U+06F5: "۵" EXTENDED ARABIC-INDIC DIGIT FIVE -->
<Key
latin:keyLabel="&#x0639;"
- latin:keyHintLabel="5"
- latin:additionalMoreKeys="5,&#x06F5;" />
+ latin:keyHintLabel="&#x06F5;"
+ latin:additionalMoreKeys="&#x06F5;,5" />
<!-- U+0647: "ه" ARABIC LETTER HEH
U+FEEB: "ﻫ" ARABIC LETTER HEH INITIAL FORM
U+0647/U+200D: ARABIC LETTER HEH + ZERO WIDTH JOINER
- U+06C0: "ۀ" ARABIC LETTER HEH WITH YEH ABOVE
+ U+0647/U+0654: ARABIC LETTER HEH + ARABIC HAMZA ABOVE
U+0629: "ة" ARABIC LETTER TEH MARBUTA
U+06F6: "۶" EXTENDED ARABIC-INDIC DIGIT SIX -->
- <!-- TODO: DroidSansArabic lacks the glyph of U+06C0 ARABIC LETTER HEH WITH YEH ABOVE -->
<Key
latin:keyLabel="&#x0647;"
- latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x06C0;,&#x0629;,%"
- latin:keyHintLabel="6"
- latin:additionalMoreKeys="6,&#x06F6;" />
+ latin:moreKeys="&#xFEEB;|&#x0647;&#x200D;,&#x0647;&#x0654;,&#x0629;,%"
+ latin:keyHintLabel="&#x06F6;"
+ latin:additionalMoreKeys="&#x06F6;,6" />
<!-- U+062E: "خ" ARABIC LETTER KHAH
U+06F7: "۷" EXTENDED ARABIC-INDIC DIGIT SEVEN -->
<Key
latin:keyLabel="&#x062E;"
- latin:keyHintLabel="7"
- latin:additionalMoreKeys="7,&#x06F7;" />
+ latin:keyHintLabel="&#x06F7;"
+ latin:additionalMoreKeys="&#x06F7;,7" />
<!-- U+062D: "ح" ARABIC LETTER HAH
U+06F8: "۸" EXTENDED ARABIC-INDIC DIGIT EIGHT -->
<Key
latin:keyLabel="&#x062D;"
- latin:keyHintLabel="8"
- latin:additionalMoreKeys="8,&#x06F8;" />
+ latin:keyHintLabel="&#x06F8;"
+ latin:additionalMoreKeys="&#x06F8;,8" />
<!-- U+062C: "ج" ARABIC LETTER JEEM
U+06F9: "۹" EXTENDED ARABIC-INDIC DIGIT NINE -->
<Key
latin:keyLabel="&#x062C;"
- latin:keyHintLabel="9"
- latin:additionalMoreKeys="9,&#x06F9;" />
+ latin:keyHintLabel="&#x06F9;"
+ latin:additionalMoreKeys="&#x06F9;,9" />
<!-- U+0686: "چ" ARABIC LETTER TCHEH
U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO -->
<Key
latin:keyLabel="&#x0686;"
- latin:keyHintLabel="0"
- latin:additionalMoreKeys="0,&#x06F0;" />
+ latin:keyHintLabel="&#x06F0;"
+ latin:additionalMoreKeys="&#x06F0;,0" />
</merge>
diff --git a/java/res/xml/rowkeys_farsi2.xml b/java/res/xml/rowkeys_farsi2.xml
index 77279c60f..21548936e 100644
--- a/java/res/xml/rowkeys_farsi2.xml
+++ b/java/res/xml/rowkeys_farsi2.xml
@@ -31,10 +31,12 @@
latin:moreKeys="&#x0636;" />
<!-- U+06CC: "ی" ARABIC LETTER FARSI YEH
U+0626: "ئ" ARABIC LETTER YEH WITH HAMZA ABOVE
- U+064A: "ي" ARABIC LETTER YEH -->
+ U+064A: "ي" ARABIC LETTER YEH
+ U+FBE8: "ﯨ" ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM
+ U+0649: "ى" ARABIC LETTER ALEF MAKSURA -->
<Key
latin:keyLabel="&#x06CC;"
- latin:moreKeys="&#x0626;,&#x064A;" />
+ latin:moreKeys="&#x0626;,&#x064A;,&#xFBE8;|&#x0649;" />
<!-- U+0628: "ب" ARABIC LETTER BEH -->
<Key
latin:keyLabel="&#x0628;" />
@@ -44,19 +46,18 @@
<!-- U+0627: "ا" ARABIC LETTER ALEF
U+0621: "ء" ARABIC LETTER HAMZA
U+0622: "آ" ARABIC LETTER ALEF WITH MADDA ABOVE
- U+0672: "ٲ" ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE
+ U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
U+0671: "ٱ" ARABIC LETTER ALEF WASLA
- U+0673: "ٳ" ARABIC LETTER ALEF WITH WAVY HAMZA BELOW-->
- <!-- TODO: DroidSansArabic lacks the glyph of U+0672 ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE -->
- <!-- TODO: DroidSansArabic lacks the glyph of U+0673 ARABIC LETTER ALEF WITH WAVY HAMZA BELOW -->
+ U+0625: "إ" ARABIC LETTER ALEF WITH HAMZA BELOW -->
<Key
latin:keyLabel="&#x0627;"
- latin:moreKeys="&#x0621;,&#x0622;,&#x0672;,&#x0671;,&#x0673;" />
+ latin:moreKeys="&#x0621;,&#x0622;,&#x0623;,&#x0671;,&#x0625;" />
<!-- U+062A: "ت" ARABIC LETTER TEH
- U+062B: "ﺙ" ARABIC LETTER THEH -->
+ U+062B: "ﺙ" ARABIC LETTER THEH
+ U+0629: "ة": ARABIC LETTER TEH MARBUTA -->
<Key
latin:keyLabel="&#x062A;"
- latin:moreKeys="&#x062B;" />
+ latin:moreKeys="&#x062B;,&#x0629;" />
<!-- U+0646: "ن" ARABIC LETTER NOON -->
<Key
latin:keyLabel="&#x0646;" />
diff --git a/java/res/xml/rowkeys_farsi3.xml b/java/res/xml/rowkeys_farsi3.xml
index 8db56e340..29c35134c 100644
--- a/java/res/xml/rowkeys_farsi3.xml
+++ b/java/res/xml/rowkeys_farsi3.xml
@@ -26,29 +26,28 @@
<Key
latin:keyLabel="&#x0637;"
latin:moreKeys="&#x0638;" />
- <!-- U+0698: "ژ" ARABIC LETTER JEH -->
+ <!-- U+0632: "ز" ARABIC LETTER ZAIN
+ U+0698: "ژ" ARABIC LETTER JEH -->
<Key
- latin:keyLabel="&#x0698;" />
- <!-- U+0632: "ز" ARABIC LETTER ZAIN -->
- <Key
- latin:keyLabel="&#x0632;" />
+ latin:keyLabel="&#x0632;"
+ latin:moreKeys="&#x0698;" />
<!-- U+0631: "ر" ARABIC LETTER REH -->
<Key
latin:keyLabel="&#x0631;" />
- <!-- U+062F: "د" ARABIC LETTER DAL
- U+0630: "ذ" ARABIC LETTER THAL -->
+ <!-- U+0630: "ذ" ARABIC LETTER THAL -->
+ <Key
+ latin:keyLabel="&#x0630;" />
+ <!-- U+062F: "د" ARABIC LETTER DAL -->
<Key
- latin:keyLabel="&#x062F;"
- latin:moreKeys="&#x0630;" />
+ latin:keyLabel="&#x062F;" />
<!-- U+067E: "پ" ARABIC LETTER PEH -->
<Key
latin:keyLabel="&#x067E;" />
<!-- U+0648: "و" ARABIC LETTER WAW
- U+0676: "ٶ" ARABIC LETTER HIGH HAMZA WAW -->
- <!-- TODO: DroidSansArabic lacks the glyph of U+0676 ARABIC LETTER HIGH HAMZA WAW -->
+ U+0624: "ؤ" ARABIC LETTER WAW WITH HAMZA ABOVE -->
<Key
latin:keyLabel="&#x0648;"
- latin:moreKeys="&#x0676;" />
+ latin:moreKeys="&#x0624;" />
<!-- U+06AF: "گ" ARABIC LETTER GAF -->
<Key
latin:keyLabel="&#x06AF;" />
diff --git a/java/res/xml/rowkeys_symbols2.xml b/java/res/xml/rowkeys_symbols2.xml
index 34b9aa2ee..425e20470 100644
--- a/java/res/xml/rowkeys_symbols2.xml
+++ b/java/res/xml/rowkeys_symbols2.xml
@@ -21,10 +21,28 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <Key
- latin:keyLabel="\@" />
- <Key
- latin:keyLabel="\#" />
+ <switch>
+ <case
+ latin:languageCode="fa"
+ >
+ <!-- U+066C: "٬" ARABIC THOUSANDS SEPARATOR
+ U+066B: "٫" ARABIC DECIMAL SEPARATOR -->
+ <Key
+ latin:keyLabel="&#x066C;"
+ latin:keyHintLabel="\@"
+ latin:moreKeys="\@" />
+ <Key
+ latin:keyLabel="&#x066B;"
+ latin:keyHintLabel="#"
+ latin:moreKeys="#" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel="\@" />
+ <Key
+ latin:keyLabel="#" />
+ </default>
+ </switch>
<Key
latin:keyStyle="currencyKeyStyle" />
<Key
diff --git a/java/res/xml/rowkeys_symbols3.xml b/java/res/xml/rowkeys_symbols3.xml
index 2b2d9a4ea..c89716bc7 100644
--- a/java/res/xml/rowkeys_symbols3.xml
+++ b/java/res/xml/rowkeys_symbols3.xml
@@ -24,12 +24,30 @@
<Key
latin:keyLabel="!text/keylabel_for_symbols_exclamation"
latin:moreKeys="!text/more_keys_for_symbols_exclamation" />
- <Key
- latin:keyLabel="&quot;"
- latin:moreKeys="!text/more_keys_for_double_quote" />
- <Key
- latin:keyLabel="\'"
- latin:moreKeys="!text/more_keys_for_single_quote" />
+ <switch>
+ <case
+ latin:languageCode="fa"
+ >
+ <!-- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+ U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
+ <Key
+ latin:keyLabel="&#x00AB;"
+ latin:code="0x00BB"
+ latin:moreKeys="!text/more_keys_for_double_quote" />
+ <Key
+ latin:keyLabel="&#x00BB;"
+ latin:code="0x00AB"
+ latin:moreKeys="!text/more_keys_for_single_quote" />
+ </case>
+ <default>
+ <Key
+ latin:keyLabel="&quot;"
+ latin:moreKeys="!text/more_keys_for_double_quote" />
+ <Key
+ latin:keyLabel="\'"
+ latin:moreKeys="!text/more_keys_for_single_quote" />
+ </default>
+ </switch>
<Key
latin:keyLabel=":" />
<Key