Release 1.23.0 (35)

New default Czech layout (#380 )
The previous default layout is renamed `latn_qwertz_cz_multifunctional`.
2025-08-18 00:19:56 +02:00 · 2023-07-01 17:27:08 +02:00 · 2023-07-01 17:04:31 +02:00 · 2023-07-01 16:38:36 +02:00 · 2023-06-28 18:04:32 +02:00 · 2023-06-28 17:50:32 +02:00
116 changed files with 3275 additions and 1148 deletions
--- a/.github/workflows/check-layouts.yml
+++ b/.github/workflows/check-layouts.yml
@@ -0,0 +1,19 @@
+name: Check layouts
+
+# Runs 'gen_layouts.py' and checks that the generated file were uptodate.
+# This doesn't run 'check_layout.py'.
+
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
+
+jobs:
+  check-layouts:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v3
+    - run: python3 gen_layouts.py
+    - name: Check that the generated layouts.xml is uptodate, run python3 gen_layouts.py otherwise
+      run: git diff --exit-code
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="juloo.keyboard2" android:versionCode="31" android:versionName="1.20.2" android:hardwareAccelerated="false">
-  <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="31"/>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="juloo.keyboard2" android:versionCode="35" android:versionName="1.23.0" android:hardwareAccelerated="false">
+  <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="33"/>
  <application android:label="@string/app_name" android:allowBackup="true" android:icon="@drawable/ic_launcher" android:hardwareAccelerated="false">
    <service android:name="juloo.keyboard2.Keyboard2" android:label="@string/app_name" android:permission="android.permission.BIND_INPUT_METHOD" android:exported="true" android:directBootAware="true">
      <intent-filter>
@@ -13,6 +13,12 @@
        <action android:name="android.intent.action.MAIN"/>
      </intent-filter>
    </activity>
+    <activity android:name="juloo.keyboard2.LauncherActivity" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@style/android:Theme.DeviceDefault" android:exported="true" android:directBootAware="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
  </application>
  <uses-permission android:name="android.permission.VIBRATE"/>
  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -37,7 +37,7 @@ gpg -c --armor --pinentry-mode loopback --passphrase debug0 --yes "debug.keystor

 A file will be generated inside the local `_build/` folder, called `debug.keystore.asc`

-You can copy the content of this file, and with that, paste it into a new github secret in your repo settings. 
+You can copy the content of this file, and with that, paste it into a new github secret in your repo settings.

 The secret must be named `DEBUG_KEYSTORE`

@@ -52,11 +52,8 @@ And finally, install the application with:
 make installd
 ```

-The debug version of the application won't be removed, both versions will stay
-installed at the same time.
-
-The application must be enabled in the settings:
-System > Languages & input > On-screen keyboard > Manage on-screen keyboards.
+The released version of the application won't be removed, both versions will
+be installed at the same time.

 ## Debugging the application: INSTALL_FAILED_UPDATE_INCOMPATIBLE

@@ -80,23 +77,39 @@ make installd

 ### Adding a layout

-Layouts are defined in XML, see `res/xml/qwerty.xml`.
+Layouts are defined in XML, see `res/xml/latn_qwerty_us.xml`.
+An online tool for editing layout files written by @Lixquid is available
+[here](https://unexpected-keyboard-layout-editor.lixquid.com/).

-An entry must be added to the layout option in `res/values/arrays.xml`, to both
-`pref_layout_values` (correspond to the file name) and `pref_layout_entries`
-(display name).
+Makes sure to specify the `name` attribute like in `latn_qwerty_us.xml`,
+otherwise the layout won't be added to the app.

-The layout must also be referenced in `srcs/juloo.keyboard2/Config.java` in
-`layoutId_of_string`.
+The layout file must be placed in the `res/xml/` directory and named according to:
+- script (`latn` for latin, etc..)
+- layout name (eg. the name of a standard)
+- country code (or language code if more adequate)
+
+Then, run `make gen_layouts` to add the layout to the app.
+
+The last step will update the file `res/values/layouts.xml`, that you should
+not edit directly.
+
+Run `make check_layouts` to check some properties about your layout. This will
+change the file `check_layout.output`, which you should commit.

 #### Adding a programming layout

 A programming layout must contains every ASCII characters.
 The current programming layouts are: QWERTY, Dvorak and Colemak.

-Keys with a name starting in `loc ` are hidden unless they are configured for
-the user's installed languages in `res/xml/method.xml`. These keys are optional
-and will be added automatically when necessary.
+See for example, Dvorak, added in https://github.com/Julow/Unexpected-Keyboard/pull/16
+
+It's best to leave free spots on the layout for language-specific symbols that
+are added automatically when necessary.
+These symbols are defined in `res/xml/method.xml` (`extra_keys`).
+
+It's possible to place extra keys with the `loc` prefix. These keys are
+normally hidden unless they are needed.

 Some users cannot easily type the characters close the the edges of the screen
 due to a bulky phone case. It is best to avoid placing important characters
@@ -116,7 +129,11 @@ Supported locales are defined in `res/xml/method.xml`.

 The attributes `languageTag` and `imeSubtypeLocale` define a locale, the
 attribute `imeSubtypeExtraValue` defines the default layout and the dead-keys
-and other extra keys to show. 
+and other extra keys to show.
+
+The list of language tags (generally two letters)
+and locales (generally of the form `xx_XX`)
+can be found in this stackoverflow answer: https://stackoverflow.com/a/7989085

 ### Translations

@@ -127,10 +144,26 @@ The app can be translated by writing `res/values-<language code>/strings.xml`
 (for example `values-fr`, `values-lv`), based on the default:
 `res/values/strings.xml` (English).

+To check that `strings.xml` is formatted correctly, run
+`python sync_translations.py`. This will modify your files.
+
 The store description is found in `metadata/android/<locale>/`,
 `short_description.txt` and `full_description.txt`.
-Translating changelogs is not useful. Changelogs are written quickly just
-before a release and older ones are never shown to anyone currently.
+Translating changelogs is not useful.

 The app name might be partially translated, the "unexpected" word should remain
 untranslated.
+
+As translations need to be updated regularly, you can subscribe to this issue
+to receive a notification when an update is needed:
+https://github.com/Julow/Unexpected-Keyboard/issues/373
+
+### Adding key combinations
+
+Key combinations are defined in `srcs/juloo.keyboard2/KeyModifier.java`.
+For example, keys modified by the `Fn` key are defined in method
+`apply_fn_char`.
+
+Keys with special meaning are defined in `KeyValue.java` in method
+`getKeyByName`. Their special action are defined in `KeyEventHandler.java` in
+method `key_up`
--- a/26
+++ b/26
@@ -22,10 +22,23 @@ clean:
 	rm -rf _build/*.dex _build/class _build/gen _build/*.apk _build/*.unsigned-apk \
 		_build/*.idsig _build/assets

-rebuild_special_font:
-	cd srcs/special_font && fontforge -lang=ff -script build.pe *.svg
+rebuild_special_font: _build/special_font.ttf
+	cp "$<" srcs/special_font/result.ttf

-.PHONY: release debug installd clean rebuild_special_font
+sync_translations:
+	python sync_translations.py
+
+check_layouts:
+	python check_layout.py $(wildcard res/xml/*.xml) > check_layout.output
+
+gen_layouts:
+	python gen_layouts.py
+
+# Will modify the source tree.
+runtest: rebuild_special_font sync_translations check_layouts gen_layouts
+
+.PHONY: release debug installd clean rebuild_special_font check_layouts \
+	sync_translations runtest gen_layouts

 $(shell mkdir -p _build)

@@ -117,3 +130,10 @@ _build/classes.dex: $(JAVA_FILES) $(R_FILE)
 		-sourcepath $(SRC_DIR):$(GEN_DIR) \
 		$^
 	$(ANDROID_BUILD_TOOLS)/d8 --output $(@D) $(OBJ_DIR)/*/*/* $(subst :, ,$(EXTRA_JARS))
+
+# Font file
+
+FONT_GLYPHS = $(wildcard srcs/special_font/*.svg)
+
+_build/special_font.ttf: srcs/special_font/build.pe $(FONT_GLYPHS)
+	fontforge -lang=ff -script $< "$@" $(FONT_GLYPHS)
--- a/README.md
+++ b/README.md
@@ -1,27 +1,5 @@
 # Unexpected Keyboard

-A lightweight virtual keyboard for developers.
-| <img src="/metadata/android/en-US/images/phoneScreenshots/1.png" alt="Screenshot-1" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/2.png" alt="Screenshot-2"/> | <img src="/metadata/android/en-US/images/phoneScreenshots/3.png" alt="Screenshot-3"/> |
-| --- | --- | --- |
-| <img src="/metadata/android/en-US/images/phoneScreenshots/4.png" alt="Screenshot-4" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/5.png" alt="Screenshot-5" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/6.png" alt="Screenshot-6" /> |
-
-The main feature is easy typing of more characters by swiping the keys toward the corners.
-
-Highlight of some of the features:
-
- Every character and special keys of a PC keyboard. This is perfect for using applications like Termux.
-
- This includes Tab, Esc, the arrows and function keys, but also Ctrl and Alt.
-
- Accented keys are accessible using dead keys. First activate the accent, then type the accented letter.
-
- Very light and fast. Use 500x times less space than Google's keyboard and 15x times less than the default keyboard. No ad, no tracking.
-
- Personalizable with many options, layouts and themes.
-
-Like any other virtual keyboards, it must be enabled in the system settings. Open the System Settings and go to:
-System > Languages & input > On-screen keyboard > Manage on-screen keyboards.
-
 [<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
     alt="Get it on F-Droid"
     height="80">](https://f-droid.org/packages/juloo.keyboard2/)
@@ -29,6 +7,19 @@ System > Languages & input > On-screen keyboard > Manage on-screen keyboards.
     alt="Get it on Google Play"
     height="80">](https://play.google.com/store/apps/details?id=juloo.keyboard2)

+Lightweight and privacy-conscious virtual keyboard for Android.
+
+| <img src="/metadata/android/en-US/images/phoneScreenshots/1.png" alt="Screenshot-1" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/2.png" alt="Screenshot-2"/> | <img src="/metadata/android/en-US/images/phoneScreenshots/3.png" alt="Screenshot-3"/> |
+| --- | --- | --- |
+| <img src="/metadata/android/en-US/images/phoneScreenshots/4.png" alt="Screenshot-4" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/5.png" alt="Screenshot-5" /> | <img src="/metadata/android/en-US/images/phoneScreenshots/6.png" alt="Screenshot-6" /> |
+
+The main feature is that you can type more characters by swiping the keys towards the corners.
+
+This application was originally designed for programmers using Termux.
+Now perfect for everyday use.
+
+This application contains no ads, doesn't make any network requests and is Open Source.
+
 ## Contributing

 For instructions on building the application, see
--- a/check_layout.output
+++ b/check_layout.output
@@ -0,0 +1,116 @@
+# res/xml/arab_alt.xml
+Layout includes some ASCII punctuation but not all, missing: !, ", ', +, -, /, :, ;, <, =, >, ?, [, \, ], _, |, ~
+1 warnings
+# res/xml/arab_pc_ckb.xml
+Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :, ;, <, =, >, ?, `, |, ~
+1 warnings
+# res/xml/arab_pc_ir.xml
+Layout includes some ASCII punctuation but not all, missing: ", $, %, ', *, ,, /, ;, <, =, >, ?, [, \, ], ^, _, `, {, |, }, ~
+1 warnings
+# res/xml/arab_pc.xml
+Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
+1 warnings
+# res/xml/beng_national.xml
+Layout includes some ASCII punctuation but not all, missing: $
+Layout doesn't specify a script.
+2 warnings
+# res/xml/beng_provat.xml
+Layout includes some ASCII punctuation but not all, missing: $, &, *, ., /, <, >, [, \, ], `, {, |, }
+Layout doesn't specify a script.
+2 warnings
+Not a layout file: res/xml/bottom_row.xml
+# res/xml/cyrl_jcuken_ru.xml
+0 warnings
+# res/xml/cyrl_jcuken_uk.xml
+0 warnings
+# res/xml/cyrl_yaverti.xml
+Layout includes some ASCII punctuation but not all, missing: ~
+1 warnings
+# res/xml/deva_alt.xml
+Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, ), *, +, ., /, :, <, =, >, @, [, \, ], ^, _, `, {, |, }, ~
+1 warnings
+# res/xml/deva_inscript.xml
+Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
+1 warnings
+# res/xml/greekmath.xml
+Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', (, ), *, +, ,, -, /, :, ;, <, >, ?, @, [, \, ], _, `, {, |, }, ~
+Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, switch_emoji, switch_second
+Layout doesn't specify a script.
+3 warnings
+# res/xml/grek_qwerty.xml
+0 warnings
+# res/xml/hang_dubeolsik_kr.xml
+0 warnings
+# res/xml/hebr_1_il.xml
+Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
+1 warnings
+# res/xml/hebr_2_il.xml
+Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
+1 warnings
+# res/xml/latn_azerty_fr.xml
+0 warnings
+# res/xml/latn_bone.xml
+Layout includes some ASCII punctuation but not all, missing: $
+1 warnings
+# res/xml/latn_colemak.xml
+0 warnings
+# res/xml/latn_dvorak.xml
+0 warnings
+# res/xml/latn_neo2.xml
+0 warnings
+# res/xml/latn_qwerty_br.xml
+0 warnings
+# res/xml/latn_qwerty_es.xml
+0 warnings
+# res/xml/latn_qwerty_hu.xml
+0 warnings
+# res/xml/latn_qwerty_lv.xml
+0 warnings
+# res/xml/latn_qwerty_no.xml
+0 warnings
+# res/xml/latn_qwerty_pl.xml
+0 warnings
+# res/xml/latn_qwerty_ro.xml
+0 warnings
+# res/xml/latn_qwerty_se.xml
+0 warnings
+# res/xml/latn_qwerty_tr.xml
+0 warnings
+# res/xml/latn_qwerty_us.xml
+0 warnings
+# res/xml/latn_qwerty_vi.xml
+Layout includes some ASCII punctuation but not all, missing: \
+1 warnings
+# res/xml/latn_qwertz_cz_multifunctional.xml
+Layout includes some ASCII punctuation but not all, missing: `
+1 warnings
+# res/xml/latn_qwertz_cz.xml
+0 warnings
+# res/xml/latn_qwertz_de.xml
+0 warnings
+# res/xml/latn_qwertz_hu.xml
+0 warnings
+# res/xml/latn_qwertz_sk.xml
+Layout includes some ASCII punctuation but not all, missing: \, `
+1 warnings
+# res/xml/latn_qwertz.xml
+0 warnings
+Not a layout file: res/xml/method.xml
+Not a layout file: res/xml/number_row.xml
+# res/xml/numeric.xml
+Layout includes some ASCII punctuation but not all, missing: &, ?, @, `
+Layout redefines the bottom row but some important keys are missing, missing: change_method, config, switch_emoji, switch_numeric, switch_second
+Layout doesn't specify a script.
+3 warnings
+# res/xml/numpad.xml
+Layout includes some ASCII punctuation but not all, missing: !, ", #, $, %, &, ', (, ), ,, :, ;, <, >, ?, @, [, \, ], ^, _, `, {, |, }, ~
+Layout doesn't define some important keys, missing: backspace, delete
+Layout redefines the bottom row but some important keys are missing, missing: action, change_method, config, ctrl, down, enter, fn, left, right, space, switch_emoji, switch_numeric, switch_second, up
+Layout doesn't specify a script.
+4 warnings
+# res/xml/pin.xml
+Layout includes some ASCII punctuation but not all, missing: !, ", $, %, &, ', ;, <, =, >, ?, @, [, \, ], ^, _, `, {, |, }, ~
+Layout redefines the bottom row but some important keys are missing, missing: change_method, config, ctrl, fn, switch_emoji, switch_second
+Layout doesn't specify a script.
+3 warnings
+Not a layout file: res/xml/settings.xml
--- a/check_layout.py
+++ b/check_layout.py
@@ -0,0 +1,75 @@
+import xml.etree.ElementTree as ET
+import sys
+
+warning_count = 0
+
+def warn(msg):
+    global warning_count
+    print(msg)
+    warning_count += 1
+
+def key_list_str(keys):
+    return ", ".join(sorted(list(keys)))
+
+def missing_some_of(keys, symbols, class_name=None):
+    if class_name is None:
+        class_name = "of [" + ", ".join(symbols) + "]"
+    missing = set(symbols).difference(keys)
+    if len(missing) > 0 and len(missing) != len(symbols):
+        warn("Layout includes some %s but not all, missing: %s" % (
+            class_name, key_list_str(missing)))
+
+def missing_required(keys, symbols, msg):
+    missing = set(symbols).difference(keys)
+    if len(missing) > 0:
+        warn("%s, missing: %s" % (msg, key_list_str(missing)))
+
+def unexpected_keys(keys, symbols, msg):
+    unexpected = set(symbols).intersection(keys)
+    if len(unexpected) > 0:
+        warn("%s, unexpected: %s" % (msg, key_list_str(unexpected)))
+
+def parse_layout(fname):
+    keys = set()
+    root = ET.parse(fname).getroot()
+    if root.tag != "keyboard":
+        return None
+    for row in root:
+        for key in row:
+            for attr in key.keys():
+                keys.add(key.get(attr).removeprefix("\\"))
+    return root, keys
+
+def check_layout(layout):
+    root, keys = layout
+    missing_some_of(keys, "~!@#$%^&*(){}`[]=\\-_;:/.,?<>'\"+|", "ASCII punctuation")
+    missing_some_of(keys, "0123456789", "digits")
+    missing_some_of(keys, ["f11_placeholder", "f12_placeholder"])
+    missing_some_of(keys, ["esc", "tab"])
+    missing_required(keys, ["backspace", "delete"], "Layout doesn't define some important keys")
+
+    bottom_row_keys = [
+            "ctrl", "fn", "switch_numeric", "change_method", "switch_emoji",
+            "config", "switch_second", "enter", "action", "left", "up", "right",
+            "down", "space"
+            ]
+
+    if root.get("bottom_row") == "false":
+        missing_required(keys, bottom_row_keys,
+                         "Layout redefines the bottom row but some important keys are missing")
+    else:
+        unexpected_keys(keys, bottom_row_keys,
+                        "Layout contains keys present in the bottom row")
+
+    if root.get("script") == None:
+        warn("Layout doesn't specify a script.")
+
+for fname in sys.argv[1:]:
+    layout = parse_layout(fname)
+    if layout == None:
+        print("Not a layout file: %s" % fname)
+    else:
+        print("# %s" % fname)
+        warning_count = 0
+        check_layout(layout)
+        print("%d warnings" % warning_count)
--- a/gen_layouts.py
+++ b/gen_layouts.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+
+# Generates the list of layouts in res/values/layouts.xml from the layout files
+# in res/xml. Every layouts must have a 'name' attribute to be listed.
+
+import itertools as it
+import sys, os, glob
+import xml.etree.ElementTree as XML
+
+# Layouts first in the list (these are the programming layouts). Other layouts
+# are sorted alphabetically.
+FIRST_LAYOUTS = [ "latn_qwerty_us", "latn_colemak", "latn_dvorak" ]
+
+# File names that are known not to be layouts. Avoid warning about them.
+KNOWN_NOT_LAYOUT = set([
+    "number_row", "numpad", "pin", "bottom_row", "settings", "method",
+    "greekmath", "numeric" ])
+
+# Read a layout from a file. Returns [None] if [fname] is not a layout.
+def read_layout(fname):
+    root = XML.parse(fname).getroot()
+    if root.tag != "keyboard":
+        return None
+    return { "name": root.get("name") }
+
+# Yields the id (based on the file name) and the display name for every layouts
+def read_layouts(files):
+    for layout_file in files:
+        layout_id, _ = os.path.splitext(os.path.basename(layout_file))
+        layout = read_layout(layout_file)
+        if layout_id in KNOWN_NOT_LAYOUT:
+            continue
+        elif layout == None:
+            print("Not a layout file: %s" % layout_file)
+        elif layout["name"] == None:
+            print("Layout doesn't have a name: %s" % layout_id)
+        else:
+            yield (layout_id, layout["name"])
+
+# Sort layouts alphabetically, except for layouts in FIRST_LAYOUTS, which are
+# placed at the top.
+# Returns a list. 'layouts' can be an iterator.
+def sort_layouts(layouts):
+    layouts = dict(layouts)
+    head = [ (lid, layouts.pop(lid)) for lid in FIRST_LAYOUTS ]
+    return head + sorted(layouts.items())
+
+# Write the XML arrays used in the preferences.
+def generate_arrays(out, layouts):
+    def mk_array(tag, name, strings_items):
+        elem = XML.Element(tag, name=name)
+        for s in strings_items:
+            item = XML.Element("item")
+            item.text = s
+            elem.append(item)
+        return elem
+    none_item = [ ("none", "None") ]
+    custom_item = [ ("custom", "@string/pref_layout_e_custom") ]
+    values_items, entries_items = zip(*(none_item + layouts + custom_item)) # unzip
+    ids_items = map(lambda s: "@xml/%s" % s if s not in ["none", "custom"] else "-1", values_items)
+    root = XML.Element("resources")
+    root.append(XML.Comment(text="DO NOT EDIT. This file is generated, see gen_layouts.py."))
+    root.append(mk_array("string-array", "pref_layout_values", values_items))
+    root.append(mk_array("string-array", "pref_layout_entries", entries_items))
+    root.append(mk_array("integer-array", "layout_ids", ids_items))
+    XML.indent(root)
+    XML.ElementTree(element=root).write(out, encoding="unicode", xml_declaration=True)
+
+layouts = sort_layouts(read_layouts(glob.glob("res/xml/*.xml")))
+with open("res/values/layouts.xml", "w") as out:
+    generate_arrays(out, layouts)
--- a/metadata/android/de-DE/full_description.txt
+++ b/metadata/android/de-DE/full_description.txt
@@ -1,18 +1,6 @@
-Diese App ist eine virtuelle Tastatur für Android. Hauptfunktionen sind das einfache Tippen eines jeden ASCII-Zeichens durch Wischgesten, Hilfstasten, Tottasten für Akzente, sowie das Vorhandensein spezieller Tasten (Tabulator, Esc, Pfeiltasten etc.). 
+Diese Tastatur zeichnet sich dadurch aus, dass man zusätzliche Zeichen durch Wischgesten in Richtung der Tastenecken eingeben kann. 

-Die Tastatur hat bis zu vier Extrazeichen in den Ecken jeder Taste. Diese Extrazeichen werden durch das Wischen mit dem Finger auf der Taste ausgewählt.
+Die Anwendung wurde ursprünglich für das Programmieren in Termux entwickelt.
+Mittlerweile ist sie auch für den täglichen Gebrauch perfekt geeignet.

-Highlights mancher Funktionen:
-
- Jedes Zeichen und jede spezielle Taste gibt es auch auf einer PC-Tastatur. Das ist perfekt für die Nutzung von Anwendungen wie Termux.
-
- Dies schließt auch Tab, Esc und die Pfeil- und Funktionstasten sowie Strg und Alt mit ein!
-
- Akzenttasten sind über Tottasten verfügbar. Nach Aktivieren des Akzents kan der akzentuierte Buchstabe getippt werden. 
-
- Sehr schlank und schnell. Braucht 500x weniger Speicherplatz als Googles Tastatur und 15x weniger als die Standardtastatur. Keine Werbung, kein Tracking.
-
- Verschiedene Layouts: QWERTY, QWERTZ, AZERTY. Themes: Weiß, Dunkel, OLED Schwarz. Und viele weitere Optionen.
-
-Wie jede andere virtuelle Tastatur muss diese Tastatur in den Systemeinstellungen aktiviert werden. Dazu Systemeinstellungen öffnen und wie folgt vorgehen: 
-System > Sprachen und Eingabe > Bildschirmtastatur > Bildschirmtastaturen verwalten. 
+Diese App enthält keine Werbung, benötigt keinen Netzwerkzugriff und ist quelloffen.
--- a/metadata/android/de-DE/short_description.txt
+++ b/metadata/android/de-DE/short_description.txt
@@ -1 +1 @@
-Eine schlanke Bildschirmtastatur für Entwickler
+Eine schlanke, datenschutzfreundliche Bildschirmtastatur für Android.
--- a/metadata/android/en-US/changelogs/32.txt
+++ b/metadata/android/en-US/changelogs/32.txt
@@ -0,0 +1,10 @@
+New translations: Vietnamese
+New layouts: Hebrew, Vietnamese
+
+Move the cursor by sliding on the space bar.
+New ePaper theme.
+Added number row.
+Option to switch to the previous keyboard.
+Updated translations.
+
+Thanks to the contributors: @K4zoku, @rVnPower, @RamKromberg, @MAKI1LOVE
--- a/metadata/android/en-US/changelogs/33.txt
+++ b/metadata/android/en-US/changelogs/33.txt
@@ -0,0 +1,7 @@
+New layouts: Arabic, Devanagari
+
+Updated translations.
+Updated layouts.
+Bugs fixed.
+
+Thanks to the contributors: @ChasmSolacer, @mostafaayesh, @lrvideckis, @eandersons, @mscheidemann, @JackDotJS
--- a/metadata/android/en-US/changelogs/34.txt
+++ b/metadata/android/en-US/changelogs/34.txt
@@ -0,0 +1,3 @@
+Bug fixes.
+
+Thanks to the contributors: @doak
--- a/metadata/android/en-US/changelogs/35.txt
+++ b/metadata/android/en-US/changelogs/35.txt
@@ -0,0 +1,9 @@
+New layouts: Persian, Kurdish, Bengali Provat, Romanian, Czech
+New languages support: Icelandic
+Updated translations: Polish, Latvian, Russian, German, Vietnamese, Farsi, Brazilian, French, Simplified Chinese, Romanian
+
+Voice typing shortcut (can be disabled in settings).
+Improved vibration settings.
+Many bug fixes and improvements.
+
+Thanks to the contributors: @ChasmSolacer, @eandersons, @MAKI1LOVE, @Moini, @polyctena, @rVnPower, @RZHSSNZDH, @vladgba, @marciozomb13, @GoRaN909, @9-2-1, @shmVirus, @GrimPixel, @frimdo
--- a/metadata/android/en-US/full_description.txt
+++ b/metadata/android/en-US/full_description.txt
@@ -1,16 +1,6 @@
-The main feature is easy typing of more characters by swiping the keys toward the corners.
+The main feature is that you can type more characters by swiping the keys towards the corners.

-Highlight of some of the features:
+This application was originally designed for programmers using Termux.
+Now perfect for everyday use.

- Every character and special keys of a PC keyboard. This is perfect for using applications like Termux.
-
- This includes Tab, Esc, the arrows and function keys, but also Ctrl and Alt.
-
- Accented keys are accessible using dead keys. First activate the accent, then type the accented letter.
-
- Very light and fast. Use 500x times less space than Google's keyboard and 15x times less than the default keyboard. No ad, no tracking.
-
- Multiple layouts: QWERTY, QWERTZ, AZERTY. Themes: White, Dark, OLED Black. And many other options.
-
-Like any other virtual keyboards, it must be enabled in the system settings. Open the System Settings and go to:
-System > Languages & input > On-screen keyboard > Manage on-screen keyboards.
+This application contains no ads, doesn't make any network requests and is Open Source.
--- a/metadata/android/en-US/short_description.txt
+++ b/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-A lightweight virtual keyboard for developers.
+Lightweight and privacy-conscious virtual keyboard for Android.
--- a/metadata/android/fr-FR/full_description.txt
+++ b/metadata/android/fr-FR/full_description.txt
@@ -1,16 +1,6 @@
 La fonctionnalité principale est l'accès rapide à plus de caractères en balayant les touches vers les coins.

-Quelques fonctionnalités:
+Cette application a été conçue à l'origine pour les programmeurs utilisant Termux.
+Elle est maintenant parfaite pour une utilisation quotidienne.

- Tous les caractères et toutes les touches spéciales d'un clavier PC. Idéal pour utiliser une application comme Termux.
-
- Cela comprend les touches Tab, Esc, les flèches et les touches fonctions mais aussi Ctrl et Alt.
-
- Les accents sont des touches mortes. Activez d'abord l'accent et tapez ensuite la lettre accentuée.
-
- Léger et rapide. Utilise 500x fois moins d'espace que le clavier de Google et 15x fois moins que le clavier de base. Pas de pub, pas de traqueur.
-
- Plusieurs configurations: QWERTY, QWERTZ, AZERTY. Thèmes: Clair, Sombre, Noir OLED. Et beaucoup d'autres options.
-
-Comme tous les claviers virtuels, il doit être activé dans les paramètres systèmes. Ouvrez les paramètres et allez dans:
-Système > Langue & saisie > Clavier à l'écran > Gérer les claviers à l'écran.
+Cette application ne contient pas de publicité, n'accède pas au réseau et est Open Source.
--- a/metadata/android/fr-FR/short_description.txt
+++ b/metadata/android/fr-FR/short_description.txt
@@ -1 +1 @@
-Le meilleur clavier pour les développeurs.
+Clavier virtuel léger et respectueux de la vie privée pour Android.
--- a/metadata/android/lv-LV/full_description.txt
+++ b/metadata/android/lv-LV/full_description.txt
@@ -1,18 +1,6 @@
-Šī lietotne ir tastatūra Android tālruņiem. Galvenās iespējas ir ērta ASCII rakstzīmju ievadīšana ar pavilkšanas kustību, taustiņi piekļūšanai uzsvara zīmēm un pārveidošanas taustiņiem un īpašo taustiņu esamība (Tab, Esc, bultas utt.).
+Galvenā iezīme ir iespēja ievadīt vairāk rakstzīmju ar pavilkšanu uz taustiņu stūriem.

-Tastatūrā ir redzamas līdz 4 papildus rakstzīmēm katra taustiņa stūros. Tām var piekļūt ar pirksta pavilkšanu uz taustiņa attiecīgajā virzienā.
+Šī lietotne sākotnēji tika izstrādāta programmētājiem, kas izmanto Termux.
+Tagad lieliski piemērota izmantošanai ikdienā.

-Izceltās iespējas:
-
- Visas rakstzīmes un īpašie taustiņi, kas ir atrodami arī datora tastatūrā. Tas lieliski noder tādās lietotnēs kā, piemēram, Termux.
-
- Ir iekļauti Tab, Esc, bultas un darbību taustiņi, kā arī Ctrl un Alt.
-
- Uzsvara zīmju taustiņi ir pieejami ar īpašām pogām. Vispirms jāizvēlas uzsvara zīmes veids, tad jāievada vēlamais burts.
-
- Ļoti viegla un ātra. Izmanto 500 reižu mazāk vietas kā Google tastatūra un 15 reižu mazāk kā noklusējuma tastatūra. Bez reklāmām un izsekošanas.
-
- Dažādi izkārtojumi: QWERTY, QWERTZ, AZERTY. Izskats: Gaišs, Tumšs, OLED melns. Kā arī daudzas citas papildiespējas.
-
-Kā jebkura cita tālruņa tastatūra, tā ir jāiespējo ierīces iestatījumos. Jāatver Iestatījumi un tad:
-Sistēma > Valodas un ievade > Virtuālā tastatūra > Pārvaldīt tastatūras.
+Šī lietotne nesatur reklāmas, neveic nekādus tīkla pieprasījumus, un tās pirmkods ir pieejams visiem.
--- a/metadata/android/lv-LV/short_description.txt
+++ b/metadata/android/lv-LV/short_description.txt
@@ -1 +1 @@
-Viegla un ātra tālruņa tastatūra izstrādātājiem.
+Mazizmēra un privātumu ievērojoša virtuālā Android tastatūra.
--- a/metadata/android/pl-PL/full_description.txt
+++ b/metadata/android/pl-PL/full_description.txt
@@ -1,18 +1,6 @@
-Ta aplikacja to klawiatura wirtualna dla Androida. Jej główne funkcjonalności obejmują łatwe wprowadzanie każdego znaku ASCII przy użyciu gestu przesunięcia, martwe klawisze dla znaków diakrytycznych i klawisze modyfikujące oraz obecność klawiszy specjalnych (tab, esc, strzałki, itp.).
+Główną cechą tej klawiatury jest możliwość wprowadzania więcej znaków poprzez przesuwanie po klawiszach do ich rogów.

-Klawiatura mieści do czterech dodatkowych znaków w rogach każdego klawisza. Są one wprowadzane poprzez przesuwanie palcem po klawiszu.
+Ta aplikacja została pierwotnie zaprojektowana z myślą o programistach używających Termuxa.
+Obecnie nadaje się doskonale do codziennego użytku.

-Wyróźnione funkcjonalności:
-
- Wszystkie znaki i klawisze specjalne, które są również dostępne na klawiaturze komputerowej. Doskonałe do korzystania z aplikacji takich jak Termux.
-
- Obejmują one Tab, Esc, strzałki, klawisze funkcyjne oraz Ctrl i Alt !
-
- Znaki akcentowane uzyskuje się za pomocą martwych klawiszy. Najpierw naciśnij akcent, a następnie wpisz akcentowaną literę.
-
- Bardzo lekka i szybka. Zajmuje 500x mniej miejsca niż klawiatura Google i 15x mniej niż klawiatura domyślna. Bez reklam, bez śledzenia.
-
- Wiele układów: QWERTY, QWERTZ, AZERTY. Motywy: Biały, Ciemny, Czarny (OLED). Oraz wiele innych możliwości.
-
-Tak jak każda inna klawiatura ekranowa, należy ją włączyć w ustawieniach systemowych. Otwórz Ustawienia i przejdź kolejno do:
-System > Języki i metody wprowadzania > Klawiatura ekranowa > Zarządzaj klawiaturami ekranowymi.
+Aplikacja nie zawiera reklam, nie żąda dostępu do internetu, a jej kod źródłowy jest dostępny publicznie.
--- a/metadata/android/pl-PL/short_description.txt
+++ b/metadata/android/pl-PL/short_description.txt
@@ -1 +1 @@
-Lekka klawiatura wirtualna dla programistów.
+Lekka i dbająca o prywatność klawiatura wirtualna dla Androida.
--- a/metadata/android/pt-BR/title.txt
+++ b/metadata/android/pt-BR/title.txt
@@ -1 +1 @@
-Unexpected Keyboard
+Teclado Unexpected
--- a/metadata/android/ro-RO/full_description.txt
+++ b/metadata/android/ro-RO/full_description.txt
@@ -0,0 +1,6 @@
+Funcționalitatea principală este accesul rapid la o mulțime de caractere ASCII prin glisarea către colțurile tastelor.
+
+Această aplicație a fost concepută inițial pentru programatori care folosec Termux.
+Este perfectă pentru uzul cotidian.
+
+Această aplicație nu conține publicitate, nu folosește rețeaua deloc și e Open Source.
--- a/metadata/android/ro-RO/short_description.txt
+++ b/metadata/android/ro-RO/short_description.txt
@@ -0,0 +1 @@
+Tastatură virtuală pentru Android, ușoară și respectuoasă cu viața privată.
--- a/metadata/android/ro-RO/title.txt
+++ b/metadata/android/ro-RO/title.txt
@@ -0,0 +1 @@
+Unexpected Keyboard
--- a/metadata/android/ru-RU/full_description.txt
+++ b/metadata/android/ru-RU/full_description.txt
@@ -1,16 +1,6 @@
 Главная особенность клавиатуры - это возможность легко напечатать любой ASCII символ за счет свайпов в углы клавиш.

-Основные особенности:
+Приложение изначально было разработано для использования Termux.
+На данный момент, оно также удобно в повседневном использовании.

- Есть все символы и специальные клавиши компьютерной клавиатуры. Идеально подходит для таких приложений, как Termux.
-
- Включены клавиши Tab, Esc, стрелки, функциональные клавиши, Ctrl и Alt.
-
- Клавиши с акцентами доступны с помощью мёртвых клавиш. Сначала нажмите на акцент, затем нажмите на букву с акцентом.
-
- Очень легкая и быстрая. Использует в 500 раз меньше места, чем Google клавиатура и в 15 раз меньше дефолтной клавиатуры. Никакой рекламы, никаких трекеров.
-
- Множество раскладок: QWERTY, QWERTZ, AZERTY и т.д. Темы: белая, темная. Множество других опций.
-
-Клавиатура, как и все виртуальные клавиатуры, должна быть активирована в настройках. Откройте Настройки и перейдите:
-Язык и ввод > Блок "Клавиатура" или "Способ ввода" > поставить галочку напротив Unexpected Keyboard
+Приложение не содержит рекламы, не осуществляет никаких запросов в сеть и имеет открытый исходный код.
--- a/metadata/android/ru-RU/short_description.txt
+++ b/metadata/android/ru-RU/short_description.txt
@@ -1 +1 @@
-Легкая виртуальная клавиатура для разработчиков.
+Легкая виртуальная клавиатура для пользователей, заботящихся о своей конфиденциальности.
--- a/metadata/android/vi-VN/full_description.txt
+++ b/metadata/android/vi-VN/full_description.txt
@@ -0,0 +1,6 @@
+Chức năng chính là dễ dàng gõ nhiều ký tự bằng cách kéo phím về góc của nó.
+
+Ứng dụng này ban đầu được thiết kế cho các lập trình viên dùng Termux.
+Bây giờ đã hoàn hảo cho việc sử dụng hàng ngày.
+
+Ứng dụng này không chứa quảng cáo, không cần đến mạng, và có mã nguồn mở.
--- a/metadata/android/vi-VN/short_description.txt
+++ b/metadata/android/vi-VN/short_description.txt
@@ -0,0 +1 @@
+Bàn phím ảo gọn nhẹ và tôn trọng quyền riêng tư cho Android.
--- a/res/layout/launcher_activity.xml
+++ b/res/layout/launcher_activity.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="vertical">
+  <TextView style="@style/paragraph" android:text="@string/launcher_description"/>
+  <Button style="@style/paragraph" android:text="@string/launcher_button_imesettings" android:onClick="launch_imesettings" android:layout_width="wrap_content"/>
+  <TextView style="@style/paragraph" android:text="@string/launcher_sourcecode" android:autoLink="web"/>
+  <TextView android:id="@+id/launcher_tryhere_text" style="@style/paragraph" android:text="@string/launcher_tryhere"/>
+  <EditText android:id="@+id/launcher_tryhere_area" style="@style/paragraph" android:inputType="text"/>
+</LinearLayout>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -21,11 +21,11 @@
  <!-- <string name="pref_show_numpad_never">Never</string> -->
  <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
  <!-- <string name="pref_show_numpad_always">Always</string> -->
+  <!-- <string name="pref_number_row_title">Show number row</string> -->
+  <!-- <string name="pref_number_row_summary">Add a number row at the top of the keyboard when the numpad is hidden</string> -->
  <!-- <string name="pref_numpad_layout">NumPad layout</string> -->
  <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
  <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
-  <string name="pref_autocapitalisation_title">Automatická kapitalizace</string>
-  <string name="pref_autocapitalisation_summary">Stiskne Shift na začátku věty</string>
  <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
  <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
  <string name="pref_second_layout_none">Žádné</string>
@@ -34,12 +34,15 @@
  <string name="pref_swipe_dist_summary">Jak daleko je třeba posunout prst pro napsaní znaku/diakritiky v rozích klávey (%s)</string>
  <string name="pref_long_timeout_title">Časová prodleva opakování znaků</string>
  <string name="pref_long_interval_title">Interval opakování znaků</string>
-  <string name="pref_vibrate_title">Vibrace</string>
-  <string name="pref_vibrate_summary">Zapnout/Vypnout vibrace při stisku klávesy</string>
-  <string name="pref_precise_repeat_title">Precizní posun kurzoru</string>
-  <string name="pref_precise_repeat_summary">Zda-li posun prstem ovlivňuje rychlost kurzoru</string>
  <string name="pref_lock_double_tap_title">Dvojklik pro aktivaci caps lock(u)</string>
  <string name="pref_lock_double_tap_summary">Dvojklik namísto držení modifikačních kláves po nějakou dobu</string>
+  <!-- <string name="pref_category_behavior">Behavior</string> -->
+  <string name="pref_autocapitalisation_title">Automatická kapitalizace</string>
+  <string name="pref_autocapitalisation_summary">Stiskne Shift na začátku věty</string>
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
+  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
+  <string name="pref_vibrate_title">Vibrace</string>
+  <string name="pref_vibrate_summary">Zapnout/Vypnout vibrace při stisku klávesy</string>
  <string name="pref_category_style">Styl</string>
  <string name="pref_margin_bottom_title">Spodní odsazení</string>
  <string name="pref_keyboard_height_title">Výška klávesnice</string>
@@ -51,7 +54,9 @@
  <string name="pref_theme_e_dark">Tmavý</string>
  <string name="pref_theme_e_light">Světlý</string>
  <string name="pref_theme_e_black">Černý</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
  <!-- <string name="pref_theme_e_white">White</string> -->
+  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">Velmi krátká</string>
  <string name="pref_swipe_dist_e_short">Krátká</string>
  <string name="pref_swipe_dist_e_default">Běžná</string>
@@ -62,10 +67,19 @@
  <!-- <string name="pref_category_advanced">Advanced</string> -->
  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
+  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
+  <!-- <string name="pref_vibration_e_system">System</string> -->
+  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
+  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
+  <!-- <string name="pref_vibration_e_light">Light</string> -->
  <string name="key_action_next">Další</string>
  <string name="key_action_done">Dokončit</string>
  <string name="key_action_go">Spustit</string>
  <string name="key_action_prev">Předchozí</string>
  <string name="key_action_search">Hledat</string>
  <string name="key_action_send">Odeslat</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -3,16 +3,16 @@
  <string name="app_name" product="debug">Unexpected Keyboard (Debug)</string>
  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Unexpected Keyboard - Einstellungen</string>
-  <!-- <string name="pref_portrait">In portrait mode</string> -->
-  <!-- <string name="pref_landscape">In landscape mode</string> -->
+  <string name="pref_portrait">Im Hochformatmodus</string>
+  <string name="pref_landscape">Im Querformatmodus</string>
  <string name="pref_category_layout">Layout</string>
-  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
-  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
-  <!-- <string name="pref_key_opacity">Adjust key opacity</string> -->
-  <!-- <string name="pref_key_activated_opacity">Adjust pressed key opacity</string> -->
+  <string name="pref_label_brightness">Helligkeit der Beschriftung anpassen</string>
+  <string name="pref_keyboard_opacity">Deckkraft des Tastaturhintergrunds anpassen</string>
+  <string name="pref_key_opacity">Deckkraft der Tasten anpassen</string>
+  <string name="pref_key_activated_opacity">Deckkraft gedrückter Tasten anpassen</string>
  <string name="pref_layout_title">Tastaturlayout ändern</string>
  <string name="pref_layout_e_system">Systemeinstellung</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
+  <string name="pref_layout_e_custom">Eigenes Layout</string>
  <string name="pref_accents_title">Akzente</string>
  <string name="pref_accents_e_all_installed">Akzente für alle installierten Sprachen anzeigen</string>
  <string name="pref_accents_e_selected">Akzente nur für die gewählte Sprache anzeigen</string>
@@ -21,37 +21,42 @@
  <string name="pref_show_numpad_never">Nie</string>
  <string name="pref_show_numpad_landscape">Nur im Querformat</string>
  <string name="pref_show_numpad_always">Immer</string>
-  <!-- <string name="pref_numpad_layout">NumPad layout</string> -->
-  <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
-  <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
-  <string name="pref_autocapitalisation_title">Automatische Großschreibung</string>
-  <string name="pref_autocapitalisation_summary">Shift-Taste am Satzanfang aktivieren</string>
+  <string name="pref_number_row_title">Zahlenreihe anzeigen</string>
+  <string name="pref_number_row_summary">Eine Zahlenreihe oben an der Tastatur hinzufügen, wenn der Ziffernblock ausgeblendet ist</string>
+  <string name="pref_numpad_layout">Zahlenblock-Layout</string>
+  <string name="pref_numpad_layout_e_high_first">Hohe Ziffern zuerst</string>
+  <string name="pref_numpad_layout_e_low_first">Niedrige Ziffern zuerst</string>
  <string name="pref_extra_keys_title">Zusätzliche Zeichen zur Tastatur hinzufügen</string>
-  <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
+  <string name="pref_second_layout_title">Zweites Layout</string>
  <string name="pref_second_layout_none">Keines</string>
  <string name="pref_category_typing">Tippen</string>
  <string name="pref_swipe_dist_title">Länge der Wischgeste</string>
  <string name="pref_swipe_dist_summary">Abstand der Zeichen in den Ecken der Tasten (%s)</string>
  <string name="pref_long_timeout_title">Zeitüberschreitung bei Tastenwiederholung</string>
  <string name="pref_long_interval_title">Intervall der Tastenwiederholung</string>
-  <string name="pref_vibrate_title">Vibration</string>
-  <string name="pref_vibrate_summary">Vibration bei Tastendruck ein-/ausschalten</string>
-  <string name="pref_precise_repeat_title">Präzise Cursorsteuerung</string>
-  <string name="pref_precise_repeat_summary">Geschwindigkeit der Tastenwiederholung durch weniger oder mehr Wischen anpassen</string>
  <string name="pref_lock_double_tap_title">Umschalttaste mit Doppeltippen einrasten</string>
  <string name="pref_lock_double_tap_summary">Anstatt Taste längere Zeit gedrückt zu halten</string>
+  <string name="pref_category_behavior">Verhalten</string>
+  <string name="pref_autocapitalisation_title">Automatische Großschreibung</string>
+  <string name="pref_autocapitalisation_summary">Umschalttaste am Satzanfang aktivieren</string>
+  <string name="pref_switch_input_immediate_title">Sofort zur nächsten Tastatur wechseln</string>
+  <string name="pref_switch_input_immediate_summary">Verhalten der Tastaturumschalttaste</string>
+  <string name="pref_vibrate_title">Vibration</string>
+  <string name="pref_vibrate_summary">Vibration bei Tastendruck ein-/ausschalten</string>
  <string name="pref_category_style">Design</string>
  <string name="pref_margin_bottom_title">Unterer Abstand</string>
  <string name="pref_keyboard_height_title">Höhe der Tastatur</string>
  <string name="pref_horizontal_margin_title">Horizontaler Abstand</string>
  <string name="pref_character_size_title">Größe der Beschriftung</string>
  <string name="pref_character_size_summary">Größe der Buchstaben auf den Tasten (%.2fx)</string>
-  <string name="pref_theme">Theme</string>
+  <string name="pref_theme">Thema</string>
  <string name="pref_theme_e_system">Systemeinstellung</string>
  <string name="pref_theme_e_dark">Dunkel</string>
  <string name="pref_theme_e_light">Hell</string>
  <string name="pref_theme_e_black">Schwarz</string>
+  <string name="pref_theme_e_altblack">Alternatives Schwarz</string>
  <string name="pref_theme_e_white">Weiß</string>
+  <string name="pref_theme_e_epaper">ePaper</string>
  <string name="pref_swipe_dist_e_very_short">Sehr kurz</string>
  <string name="pref_swipe_dist_e_short">Kurz</string>
  <string name="pref_swipe_dist_e_default">Normal</string>
@@ -59,13 +64,22 @@
  <string name="pref_swipe_dist_e_very_far">Sehr weit</string>
  <string name="pref_key_horizontal_space">Horizontaler Abstand zwischen den Tasten</string>
  <string name="pref_key_vertical_space">Vertikaler Abstand zwischen den Tasten</string>
-  <!-- <string name="pref_category_advanced">Advanced</string> -->
-  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
-  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
+  <string name="pref_category_advanced">Erweitert</string>
+  <string name="pref_custom_layout_title">Eigenes Layout</string>
+  <string name="pref_custom_layout_summary">Bitte Sourcecode ansehen. Diese Option ist nicht zur Verwendung vorgesehen.</string>
+  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
+  <!-- <string name="pref_vibration_e_system">System</string> -->
+  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
+  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
+  <!-- <string name="pref_vibration_e_light">Light</string> -->
  <string name="key_action_next">Nächstes</string>
  <string name="key_action_done">Fertig</string>
  <string name="key_action_go">Los</string>
  <string name="key_action_prev">Vorheriges</string>
  <string name="key_action_search">Suchen</string>
  <string name="key_action_send">Senden</string>
+  <string name="launcher_button_imesettings">Tastatur aktivieren</string>
+  <string name="launcher_description">Diese App ist eine virtuelle Tastatur. Tippe auf den Button unten und aktivere Unexpected Keyboard in den Systemeinstellungen.</string>
+  <string name="launcher_sourcecode">Dies ist eine freie und quelloffene App. Du findest den Quellcode auf <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>. Dort können auch Bugs gemeldet werden.</string>
+  <string name="launcher_tryhere">Nach Aktivierung kannst du die Tastatur hier ausprobieren:</string>
 </resources>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -21,11 +21,11 @@
  <!-- <string name="pref_show_numpad_never">Never</string> -->
  <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
  <!-- <string name="pref_show_numpad_always">Always</string> -->
+  <!-- <string name="pref_number_row_title">Show number row</string> -->
+  <!-- <string name="pref_number_row_summary">Add a number row at the top of the keyboard when the numpad is hidden</string> -->
  <!-- <string name="pref_numpad_layout">NumPad layout</string> -->
  <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
  <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
-  <!-- <string name="pref_autocapitalisation_title">Automatic capitalisation</string> -->
-  <!-- <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string> -->
  <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
  <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
  <!-- <string name="pref_second_layout_none">None</string> -->
@@ -34,12 +34,15 @@
  <string name="pref_swipe_dist_summary">Distancia de caracteres en las esquinas de las letras (%s)</string>
  <string name="pref_long_timeout_title">Tiempo de espera de repetición de tecla</string>
  <string name="pref_long_interval_title">Intervalo de repetición de tecla</string>
-  <string name="pref_vibrate_title">Vibración</string>
-  <string name="pref_vibrate_summary">Habilitar/deshabilitar vibración al presionar una tecla</string>
-  <string name="pref_precise_repeat_title">Movimientos de cursor preciso</string>
-  <string name="pref_precise_repeat_summary">Modular la velocidad de repetición de teclas según si se desliza más o menos</string>
  <!-- <string name="pref_lock_double_tap_title">Double tap on shift for caps lock</string> -->
  <!-- <string name="pref_lock_double_tap_summary">You can lock any modifier by holding it</string> -->
+  <!-- <string name="pref_category_behavior">Behavior</string> -->
+  <!-- <string name="pref_autocapitalisation_title">Automatic capitalisation</string> -->
+  <!-- <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string> -->
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
+  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
+  <string name="pref_vibrate_title">Vibración</string>
+  <string name="pref_vibrate_summary">Habilitar/deshabilitar vibración al presionar una tecla</string>
  <string name="pref_category_style">Estilo</string>
  <string name="pref_margin_bottom_title">Margen del pie</string>
  <string name="pref_keyboard_height_title">Altura del teclado</string>
@@ -51,7 +54,9 @@
  <string name="pref_theme_e_dark">Oscuro</string>
  <string name="pref_theme_e_light">Claro</string>
  <string name="pref_theme_e_black">Negro</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
  <!-- <string name="pref_theme_e_white">White</string> -->
+  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">Muy corto</string>
  <string name="pref_swipe_dist_e_short">Corto</string>
  <string name="pref_swipe_dist_e_default">Normal</string>
@@ -62,10 +67,19 @@
  <!-- <string name="pref_category_advanced">Advanced</string> -->
  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
+  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
+  <!-- <string name="pref_vibration_e_system">System</string> -->
+  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
+  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
+  <!-- <string name="pref_vibration_e_light">Light</string> -->
  <string name="key_action_next">Siguiente</string>
  <string name="key_action_done">Hecho</string>
  <string name="key_action_go">Ir</string>
  <string name="key_action_prev">Anterior</string>
  <string name="key_action_search">Buscar</string>
  <string name="key_action_send">Enviar</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name" product="debug">صفحه کلید غیرمنتظره</string>
+  <string name="app_name" product="default">صفحه کلید غیرمنتظره</string>
+  <string name="settings_activity_label">تنظیمات صفحه کلید غیرمنتظره</string>
+  <string name="pref_portrait">در حالت عمودی</string>
+  <string name="pref_landscape">در حالت افقی</string>
+  <string name="pref_category_layout">طرح</string>
+  <string name="pref_label_brightness">تنظیم برچسب روشنایی</string>
+  <string name="pref_keyboard_opacity">تنظیم کدر بودن پس‌زمینه صفحه کلید</string>
+  <string name="pref_key_opacity">تنظیم کدر بودن کلید</string>
+  <string name="pref_key_activated_opacity">تنظیم کدر بودن کلید فشرده شده</string>
+  <string name="pref_layout_title">تغییر طرح صفحه کلید</string>
+  <string name="pref_layout_e_system">تنظیمات سامانه</string>
+  <string name="pref_layout_e_custom">طرح صفارشی</string>
+  <string name="pref_accents_title">لهجه‌ها</string>
+  <string name="pref_accents_e_all_installed">نمایش لهجه‌ها برای تمام زبان‌هی نصب شده</string>
+  <string name="pref_accents_e_selected">فقط نمایش لهجه‌ها برای زبان‌های انتخاب شده</string>
+  <string name="pref_accents_e_none">پنهان کردن لهجه‌ها</string>
+  <string name="pref_show_numpad_title">نمایش پد شماره‌ها</string>
+  <string name="pref_show_numpad_never">هرگز</string>
+  <string name="pref_show_numpad_landscape">فقط در حالت افقی</string>
+  <string name="pref_show_numpad_always">همیشه</string>
+  <string name="pref_number_row_title">نمایش ردیف اعداد</string>
+  <string name="pref_number_row_summary">افزودن ردیف اعداد زمانیکه پد شماره‌ها پنهان است</string>
+  <string name="pref_numpad_layout">طرح پد شماره‌ها</string>
+  <string name="pref_numpad_layout_e_high_first">ابتدا اعداد بزرگ</string>
+  <string name="pref_numpad_layout_e_low_first">ابتدا اعداد کوچک</string>
+  <string name="pref_extra_keys_title">افزودن کلیدها به صفحه کلید</string>
+  <string name="pref_second_layout_title">طرح دوم</string>
+  <string name="pref_second_layout_none">هیچ</string>
+  <string name="pref_category_typing">درحال نوشتن</string>
+  <string name="pref_swipe_dist_title">فاصله کشیدن</string>
+  <string name="pref_swipe_dist_summary">فاصله حروف از گوشه‌های کلیدها )(%s)</string>
+  <string name="pref_long_timeout_title">درنگ تکرار کلید</string>
+  <string name="pref_long_interval_title">فاصله تکرار کلید</string>
+  <string name="pref_lock_double_tap_title">دوبار ضربه روی دگرساز برای فعال شدن کپس لاک</string>
+  <string name="pref_lock_double_tap_summary">شما میتوانید قفل کنید هر میانبری را با نگه داشتن آن</string>
+  <string name="pref_category_behavior">ٰرفتار</string>
+  <string name="pref_autocapitalisation_title">بزرگسازی خودکار</string>
+  <string name="pref_autocapitalisation_summary">در شروع جملات دگرساز را فشار دهید</string>
+  <string name="pref_switch_input_immediate_title">انتقال به آخرین صفحه کلید استفاده شده</string>
+  <string name="pref_switch_input_immediate_summary">رفتار کلید تغییردهنده صفحه کلید</string>
+  <string name="pref_vibrate_title">لرزش</string>
+  <string name="pref_vibrate_summary">فعال/غیرفعال کردن لرزش در زمان فشار دادن کلیدها</string>
+  <string name="pref_category_style">سبک</string>
+  <string name="pref_margin_bottom_title">حاشیه پایین</string>
+  <string name="pref_keyboard_height_title">ارتفاع صفحه کلید</string>
+  <string name="pref_horizontal_margin_title">حاشیه افقی</string>
+  <string name="pref_character_size_title">اندازه برچسب</string>
+  <string name="pref_character_size_summary">اندازه نویسه‌های نشان داده شده روی صفحه کلید (%.2fx)</string>
+  <string name="pref_theme">زمینه</string>
+  <string name="pref_theme_e_system">تنظیمات سامانه</string>
+  <string name="pref_theme_e_dark">تاریک</string>
+  <string name="pref_theme_e_light">روشن</string>
+  <string name="pref_theme_e_black">سیاه</string>
+  <string name="pref_theme_e_altblack">سیاه مشابه</string>
+  <string name="pref_theme_e_white">سفید</string>
+  <string name="pref_theme_e_epaper">ای-پیپر</string>
+  <string name="pref_swipe_dist_e_very_short">بسیار کوتاه</string>
+  <string name="pref_swipe_dist_e_short">کوتاه</string>
+  <string name="pref_swipe_dist_e_default">عادی</string>
+  <string name="pref_swipe_dist_e_far">دور</string>
+  <string name="pref_swipe_dist_e_very_far">بسیار دور</string>
+  <string name="pref_key_horizontal_space">فاصله افقی بین کلیدها</string>
+  <string name="pref_key_vertical_space">فاصله عمودی بین کلیدها</string>
+  <string name="pref_category_advanced">پیشرفته</string>
+  <string name="pref_custom_layout_title">طرح شخصی</string>
+  <string name="pref_custom_layout_summary">کد منبع را ببینید. این گزینه قرار نیست استفاده شود.</string>
+  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
+  <!-- <string name="pref_vibration_e_system">System</string> -->
+  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
+  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
+  <!-- <string name="pref_vibration_e_light">Light</string> -->
+  <string name="key_action_next">بعدی</string>
+  <string name="key_action_done">اتمام</string>
+  <string name="key_action_go">برو</string>
+  <string name="key_action_prev">قبلی</string>
+  <string name="key_action_search">جستجو</string>
+  <string name="key_action_send">ارسال</string>
+  <string name="launcher_button_imesettings">فعال کردن صفحه کلید</string>
+  <string name="launcher_description">این برنامه یک صفحه کلید مجازی است. با کلیک روی گزینه زیر به تنظیمات سامانه بروید و صفحه کلید غیرمنتظره را فعال کنید.</string>
+  <string name="launcher_sourcecode">این یک برنامه آزاد و منبع‌باز است. شما میتوانید پیدا کنید کد منبع را و گزارش کنید باگ‌ها را در <a href="https://github.com/Julow/Unexpected-Keyboard/">گیت‌هاب</a>.</string>
+  <string name="launcher_tryhere">بعد از فعالسازی، صفحه کلید را اینجا امتحان کنید:</string>
+</resources>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <!-- <string name="app_name" product="debug">Unexpected Keyboard (debug)</string> -->
-  <!-- <string name="app_name" product="default">Unexpected Keyboard</string> -->
+  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
+  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Unexpected Keyboard Paramètres</string>
  <string name="pref_portrait">En mode portrait</string>
  <string name="pref_landscape">En mode landscape</string>
  <string name="pref_category_layout">Disposition</string>
  <string name="pref_label_brightness">Luminosité des symboles</string>
-  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
-  <!-- <string name="pref_key_opacity">Adjust key opacity</string> -->
-  <!-- <string name="pref_key_activated_opacity">Adjust pressed key opacity</string> -->
+  <string name="pref_keyboard_opacity">Transparence du clavier</string>
+  <string name="pref_key_opacity">Transparence des touches</string>
+  <string name="pref_key_activated_opacity">Transparence des touches pressées</string>
  <string name="pref_layout_title">Disposition des touches</string>
  <string name="pref_layout_e_system">Paramètre système</string>
  <string name="pref_layout_e_custom">Disposition personnalisée</string>
@@ -21,11 +21,11 @@
  <string name="pref_show_numpad_never">Jamais</string>
  <string name="pref_show_numpad_landscape">Seulement en mode paysage</string>
  <string name="pref_show_numpad_always">Toujour</string>
+  <string name="pref_number_row_title">Rangée de nombres</string>
+  <string name="pref_number_row_summary">Ajoute une rangée de nombres en haut du clavier quand le pavé numérique est caché</string>
  <string name="pref_numpad_layout">Disposition du pavé numérique</string>
  <string name="pref_numpad_layout_e_high_first">Du plus haut au plus bas</string>
  <string name="pref_numpad_layout_e_low_first">Du plus bas au plus haut</string>
-  <string name="pref_autocapitalisation_title">Majuscule automatique</string>
-  <string name="pref_autocapitalisation_summary">Activer Shift au début des phrases</string>
  <string name="pref_extra_keys_title">Ajouter des touches au clavier</string>
  <string name="pref_second_layout_title">Disposition secondaire</string>
  <string name="pref_second_layout_none">Aucune</string>
@@ -34,12 +34,15 @@
  <string name="pref_swipe_dist_summary">La distance des caractères dans les coins (%s)</string>
  <string name="pref_long_timeout_title">Délai avant répétition</string>
  <string name="pref_long_interval_title">Écart entre les répétitions</string>
-  <string name="pref_vibrate_title">Vibreur</string>
-  <string name="pref_vibrate_summary">Vibration a chaque touche</string>
-  <string name="pref_precise_repeat_title">Mouvement précis du curseur</string>
-  <string name="pref_precise_repeat_summary">Modifier la vitesse de répétition en bougeant le doigt</string>
  <string name="pref_lock_double_tap_title">Appuyer deux fois pour bloquer la majuscule</string>
  <string name="pref_lock_double_tap_summary">Un appui long bloque la majuscule</string>
+  <string name="pref_category_behavior">Comportement</string>
+  <string name="pref_autocapitalisation_title">Majuscule automatique</string>
+  <string name="pref_autocapitalisation_summary">Activer Shift au début des phrases</string>
+  <string name="pref_switch_input_immediate_title">Changer vers le clavier utilisé en dernier</string>
+  <string name="pref_switch_input_immediate_summary">Comportement de la touche de changement de clavier</string>
+  <string name="pref_vibrate_title">Vibreur</string>
+  <string name="pref_vibrate_summary">Vibration a chaque touche</string>
  <string name="pref_category_style">Style</string>
  <string name="pref_margin_bottom_title">Marge du bas</string>
  <string name="pref_keyboard_height_title">Hauteur du clavier</string>
@@ -51,7 +54,9 @@
  <string name="pref_theme_e_dark">Sombre</string>
  <string name="pref_theme_e_light">Clair</string>
  <string name="pref_theme_e_black">Noir</string>
+  <string name="pref_theme_e_altblack">Noir 2</string>
  <string name="pref_theme_e_white">Blanc</string>
+  <string name="pref_theme_e_epaper">ePaper</string>
  <string name="pref_swipe_dist_e_very_short">Très courte</string>
  <string name="pref_swipe_dist_e_short">Courte</string>
  <string name="pref_swipe_dist_e_default">Normale</string>
@@ -62,10 +67,19 @@
  <string name="pref_category_advanced">Avancé</string>
  <string name="pref_custom_layout_title">Disposition personnalisée</string>
  <string name="pref_custom_layout_summary">Cette option n\'est pas faite pour être utilisée.</string>
+  <string name="pref_vibration_e_disabled">Désactivé</string>
+  <string name="pref_vibration_e_system">Système</string>
+  <string name="pref_vibration_e_strong">Fort</string>
+  <string name="pref_vibration_e_medium">Moyen</string>
+  <string name="pref_vibration_e_light">Léger</string>
  <string name="key_action_next">Suiv.</string>
  <string name="key_action_done">Fin</string>
  <string name="key_action_go">Aller</string>
  <string name="key_action_prev">Prec.</string>
  <string name="key_action_search">Chercher</string>
  <string name="key_action_send">Envoyer</string>
+  <string name="launcher_button_imesettings">Activer le clavier</string>
+  <string name="launcher_description">Cette application est un clavier virtuel. Activez-le dans les paramètres système en cliquant sur le bouton ci-dessous.</string>
+  <string name="launcher_sourcecode">Cette application est libre et open-source. Lisez le source code et reportez des problèmes sur <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_tryhere">Après l\'avoir activé, vous pouvez l\'essayer ici:</string>
 </resources>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -21,11 +21,11 @@
  <!-- <string name="pref_show_numpad_never">Never</string> -->
  <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
  <!-- <string name="pref_show_numpad_always">Always</string> -->
+  <!-- <string name="pref_number_row_title">Show number row</string> -->
+  <!-- <string name="pref_number_row_summary">Add a number row at the top of the keyboard when the numpad is hidden</string> -->
  <!-- <string name="pref_numpad_layout">NumPad layout</string> -->
  <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
  <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
-  <string name="pref_autocapitalisation_title">Maiuscole Automatiche</string>
-  <string name="pref_autocapitalisation_summary">Premi Shift all\'inizio di una frase</string>
  <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
  <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
  <string name="pref_second_layout_none">Nessuno</string>
@@ -34,12 +34,15 @@
  <string name="pref_swipe_dist_summary">Distanza dei caratteri negli angoli dei tasti (%s)</string>
  <string name="pref_long_timeout_title">Timeout ripetizione tasto</string>
  <string name="pref_long_interval_title">Intervallo ripetizione tasto</string>
-  <string name="pref_vibrate_title">Vibrazione</string>
-  <string name="pref_vibrate_summary">Abilita/Disabilita Vibrazione alla pressione dei tasti</string>
-  <string name="pref_precise_repeat_title">Movimento puntatore preciso</string>
-  <string name="pref_precise_repeat_summary">Modula la veocità della ripetizione con lo swipe</string>
  <string name="pref_lock_double_tap_title">Doppio tocco su Shift per attivare CapsLock</string>
  <string name="pref_lock_double_tap_summary">Invece di premere i modificatori a lungo</string>
+  <!-- <string name="pref_category_behavior">Behavior</string> -->
+  <string name="pref_autocapitalisation_title">Maiuscole Automatiche</string>
+  <string name="pref_autocapitalisation_summary">Premi Shift all\'inizio di una frase</string>
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
+  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
+  <string name="pref_vibrate_title">Vibrazione</string>
+  <string name="pref_vibrate_summary">Abilita/Disabilita Vibrazione alla pressione dei tasti</string>
  <string name="pref_category_style">Stile</string>
  <string name="pref_margin_bottom_title">Margine inferiore</string>
  <string name="pref_keyboard_height_title">Altezza tastiera</string>
@@ -51,7 +54,9 @@
  <string name="pref_theme_e_dark">Scuro</string>
  <string name="pref_theme_e_light">Chiaro</string>
  <string name="pref_theme_e_black">Nero</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
  <!-- <string name="pref_theme_e_white">White</string> -->
+  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">Veramente breve</string>
  <string name="pref_swipe_dist_e_short">Breve</string>
  <string name="pref_swipe_dist_e_default">Normale</string>
@@ -62,10 +67,19 @@
  <!-- <string name="pref_category_advanced">Advanced</string> -->
  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
+  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
+  <!-- <string name="pref_vibration_e_system">System</string> -->
+  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
+  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
+  <!-- <string name="pref_vibration_e_light">Light</string> -->
  <string name="key_action_next">Prossimo</string>
  <string name="key_action_done">Fatto</string>
  <string name="key_action_go">Vai</string>
  <string name="key_action_prev">Precedente</string>
  <string name="key_action_search">Cerca</string>
  <string name="key_action_send">Invia</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -21,11 +21,11 @@
  <!-- <string name="pref_show_numpad_never">Never</string> -->
  <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
  <!-- <string name="pref_show_numpad_always">Always</string> -->
+  <!-- <string name="pref_number_row_title">Show number row</string> -->
+  <!-- <string name="pref_number_row_summary">Add a number row at the top of the keyboard when the numpad is hidden</string> -->
  <!-- <string name="pref_numpad_layout">NumPad layout</string> -->
  <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
  <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
-  <!-- <string name="pref_autocapitalisation_title">Automatic capitalisation</string> -->
-  <!-- <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string> -->
  <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
  <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
  <!-- <string name="pref_second_layout_none">None</string> -->
@@ -34,12 +34,15 @@
  <string name="pref_swipe_dist_summary">키 모서리 문자의 입력 범위 (%s)</string>
  <string name="pref_long_timeout_title">키 길게 누르기 지연</string>
  <string name="pref_long_interval_title">키 반복 간격</string>
-  <string name="pref_vibrate_title">진동</string>
-  <string name="pref_vibrate_summary">키 누를 때 진동 키거/끄기</string>
-  <string name="pref_precise_repeat_title">정확한 커서 움직임</string>
-  <string name="pref_precise_repeat_summary">더 많거나 적은 스와이프로 키 반복 조절</string>
  <!-- <string name="pref_lock_double_tap_title">Double tap on shift for caps lock</string> -->
  <!-- <string name="pref_lock_double_tap_summary">You can lock any modifier by holding it</string> -->
+  <!-- <string name="pref_category_behavior">Behavior</string> -->
+  <!-- <string name="pref_autocapitalisation_title">Automatic capitalisation</string> -->
+  <!-- <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string> -->
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
+  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
+  <string name="pref_vibrate_title">진동</string>
+  <string name="pref_vibrate_summary">키 누를 때 진동 키거/끄기</string>
  <string name="pref_category_style">스타일</string>
  <string name="pref_margin_bottom_title">아래 넓이</string>
  <string name="pref_keyboard_height_title">키보드 높이</string>
@@ -51,7 +54,9 @@
  <string name="pref_theme_e_dark">Dark</string>
  <string name="pref_theme_e_light">Light</string>
  <string name="pref_theme_e_black">Black</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
  <!-- <string name="pref_theme_e_white">White</string> -->
+  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">매우 짧음</string>
  <string name="pref_swipe_dist_e_short">짧음</string>
  <string name="pref_swipe_dist_e_default">보통</string>
@@ -62,10 +67,19 @@
  <!-- <string name="pref_category_advanced">Advanced</string> -->
  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
+  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
+  <!-- <string name="pref_vibration_e_system">System</string> -->
+  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
+  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
+  <!-- <string name="pref_vibration_e_light">Light</string> -->
  <string name="key_action_next">다음</string>
  <string name="key_action_done">확인</string>
  <string name="key_action_go">Go</string>
  <string name="key_action_prev">이전</string>
  <string name="key_action_search">검색</string>
  <string name="key_action_send">보내기</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <dimen name="horizontal_margin">28dp</dimen>
-  <dimen name="margin_bottom">3dp</dimen>
  <dimen name="emoji_type_button_height">48dp</dimen>
 </resources>
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -3,16 +3,16 @@
  <string name="app_name" product="debug">Unexpected Keyboard (atkļūdošana)</string>
  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Unexpected Keyboard iestatījumi</string>
-  <!-- <string name="pref_portrait">In portrait mode</string> -->
-  <!-- <string name="pref_landscape">In landscape mode</string> -->
+  <string name="pref_portrait">Stateniski</string>
+  <string name="pref_landscape">Guleniski</string>
  <string name="pref_category_layout">Izkārtojums</string>
-  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
-  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
-  <!-- <string name="pref_key_opacity">Adjust key opacity</string> -->
-  <!-- <string name="pref_key_activated_opacity">Adjust pressed key opacity</string> -->
+  <string name="pref_label_brightness">Pielāgot iezīmju spilgtumu</string>
+  <string name="pref_keyboard_opacity">Pielāgot tastatūras fona necaurredzamību</string>
+  <string name="pref_key_opacity">Pielāgot taustiņu necaurredzamību</string>
+  <string name="pref_key_activated_opacity">Pielāgot piespiesta taustiņa necaurredzamību</string>
  <string name="pref_layout_title">Mainīt tastatūras izkārtojumu</string>
  <string name="pref_layout_e_system">Ierīces iestatījumi</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
+  <string name="pref_layout_e_custom">Pielāgots izkārtojums</string>
  <string name="pref_accents_title">Uzsvara zīmes</string>
  <string name="pref_accents_e_all_installed">Rādīt uzsvara zīmes visām uzstādītajām valodām</string>
  <string name="pref_accents_e_selected">Rādīt uzsvara zīmes tikai atlasītajām valodām</string>
@@ -21,25 +21,28 @@
  <string name="pref_show_numpad_never">Nekad</string>
  <string name="pref_show_numpad_landscape">Tikai guleniskajā skatā</string>
  <string name="pref_show_numpad_always">Vienmēr</string>
-  <!-- <string name="pref_numpad_layout">NumPad layout</string> -->
-  <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
-  <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
-  <string name="pref_autocapitalisation_title">Automātiski lielie burti</string>
-  <string name="pref_autocapitalisation_summary">Piespiest Shift teikuma sākumā</string>
+  <string name="pref_number_row_title">Rādīt ciparu rindu</string>
+  <string name="pref_number_row_summary">Pievienot ciparu rindu virs tastatūras, kad ciparnīca ir paslēpta</string>
+  <string name="pref_numpad_layout">Ciparnīcas izkārtojums</string>
+  <string name="pref_numpad_layout_e_high_first">Vispirms lielākie cipari</string>
+  <string name="pref_numpad_layout_e_low_first">Vispirms mazākie cipari</string>
  <string name="pref_extra_keys_title">Pievienot tastatūrai taustiņus</string>
-  <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
+  <string name="pref_second_layout_title">Otrējais izkārtojums</string>
  <string name="pref_second_layout_none">Neviens</string>
  <string name="pref_category_typing">Rakstīšana</string>
  <string name="pref_swipe_dist_title">Pavilkšanas attālums</string>
  <string name="pref_swipe_dist_summary">Taustiņu stūros esošo rakstzīmju attālums (%s)</string>
  <string name="pref_long_timeout_title">Taustiņa atkārtošanās ātrums</string>
  <string name="pref_long_interval_title">Taustiņa atkārtošanās aizture</string>
-  <string name="pref_vibrate_title">Trīcēšana</string>
-  <string name="pref_vibrate_summary">Iespējot/atspējot taustiņa piespiešanas trīcēšanu</string>
-  <string name="pref_precise_repeat_title">Pielāgojama kursora kustība</string>
-  <string name="pref_precise_repeat_summary">Mainīt taustiņa atkārtošanās ātrumu ar pavilkšanas attālumu</string>
  <string name="pref_lock_double_tap_title">Divkāršs piesitiens burtslēgam</string>
  <string name="pref_lock_double_tap_summary">Tā vietā, lai ilstoši piespiestu pārveidotāju</string>
+  <string name="pref_category_behavior">Uzvedība</string>
+  <string name="pref_autocapitalisation_title">Automātiski lielie burti</string>
+  <string name="pref_autocapitalisation_summary">Piespiest Shift teikuma sākumā</string>
+  <string name="pref_switch_input_immediate_title">Pārslēgties uz pēdējo izmantoto tastatūru</string>
+  <string name="pref_switch_input_immediate_summary">Tastatūras pārslēgšanas taustiņa uzvedība</string>
+  <string name="pref_vibrate_title">Trīcēšana</string>
+  <string name="pref_vibrate_summary">Iespējot/atspējot taustiņa piespiešanas trīcēšanu</string>
  <string name="pref_category_style">Izskata pielāgojumi</string>
  <string name="pref_margin_bottom_title">Apakšējā apmale</string>
  <string name="pref_keyboard_height_title">Tastatūras augstums</string>
@@ -51,7 +54,9 @@
  <string name="pref_theme_e_dark">Tumšs</string>
  <string name="pref_theme_e_light">Gaišs</string>
  <string name="pref_theme_e_black">Melns</string>
+  <string name="pref_theme_e_altblack">Citādi melns</string>
  <string name="pref_theme_e_white">Balts</string>
+  <string name="pref_theme_e_epaper">ePapīrs</string>
  <string name="pref_swipe_dist_e_very_short">Ļoti tuvs</string>
  <string name="pref_swipe_dist_e_short">Tuvs</string>
  <string name="pref_swipe_dist_e_default">Vidējs</string>
@@ -59,13 +64,22 @@
  <string name="pref_swipe_dist_e_very_far">Ļoti tāls</string>
  <string name="pref_key_horizontal_space">Līmeniskais attālums starp taustiņiem</string>
  <string name="pref_key_vertical_space">Stateniskais attālums starp taustiņiem</string>
-  <!-- <string name="pref_category_advanced">Advanced</string> -->
-  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
-  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
+  <string name="pref_category_advanced">Papildu</string>
+  <string name="pref_custom_layout_title">Pielāgots izkārtojums</string>
+  <string name="pref_custom_layout_summary">Skatīt pirmkodu. Šī iespēja nav paredzēta izmantošanai.</string>
+  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
+  <!-- <string name="pref_vibration_e_system">System</string> -->
+  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
+  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
+  <!-- <string name="pref_vibration_e_light">Light</string> -->
  <string name="key_action_next">Nākamais</string>
  <string name="key_action_done">Darīts</string>
  <string name="key_action_go">Aiziet</string>
  <string name="key_action_prev">Iepriekšējais</string>
  <string name="key_action_search">Meklēt</string>
  <string name="key_action_send">Sūtīt</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -3,8 +3,8 @@
  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Ustawienia Unexpected Keyboard</string>
-  <!-- <string name="pref_portrait">In portrait mode</string> -->
-  <!-- <string name="pref_landscape">In landscape mode</string> -->
+  <string name="pref_portrait">W widoku pionowym</string>
+  <string name="pref_landscape">W widoku poziomym</string>
  <string name="pref_category_layout">Układ</string>
  <string name="pref_label_brightness">Dostosuj jasność znaków</string>
  <string name="pref_keyboard_opacity">Nieprzezroczystość tła klawiatury</string>
@@ -21,11 +21,11 @@
  <string name="pref_show_numpad_never">Nigdy</string>
  <string name="pref_show_numpad_landscape">Tylko w orientacji poziomej</string>
  <string name="pref_show_numpad_always">Zawsze</string>
+  <string name="pref_number_row_title">Pokaż rząd cyfr</string>
+  <string name="pref_number_row_summary">Dodaj rząd cyfr na górze klawiatury, kiedy klaw. numeryczna jest schowana</string>
  <string name="pref_numpad_layout">Układ klawiatury numerycznej</string>
  <string name="pref_numpad_layout_e_high_first">Od największej cyfry</string>
  <string name="pref_numpad_layout_e_low_first">Od najmniejszej cyfry</string>
-  <string name="pref_autocapitalisation_title">Automatyczne wielkie litery</string>
-  <string name="pref_autocapitalisation_summary">Naciśnij Shift na początku zdania</string>
  <string name="pref_extra_keys_title">Dodaj klawisze do klawiatury</string>
  <string name="pref_second_layout_title">Drugi układ</string>
  <string name="pref_second_layout_none">Żaden</string>
@@ -34,12 +34,15 @@
  <string name="pref_swipe_dist_summary">Odległość znaków od rogów klawiszy (%s)</string>
  <string name="pref_long_timeout_title">Opóźnienie powtarzania naciśnięć klawisza</string>
  <string name="pref_long_interval_title">Czas pomiędzy powtórzeniami</string>
-  <string name="pref_vibrate_title">Wibracja</string>
-  <string name="pref_vibrate_summary">Wł./wył. wibrację przy naciśnięciu klawisza</string>
-  <string name="pref_precise_repeat_title">Dokładne poruszanie kursorem</string>
-  <string name="pref_precise_repeat_summary">Reguluj prędkość powtarzania naciśnięć klawisza poprzez przesunięcie dalej lub bliżej</string>
  <string name="pref_lock_double_tap_title">Naciśnij Shift podwójnie, aby włączyć caps lock</string>
  <string name="pref_lock_double_tap_summary">Możesz zablokować modyfikator poprzez jego długie naciśnięcie</string>
+  <string name="pref_category_behavior">Zachowanie</string>
+  <string name="pref_autocapitalisation_title">Automatyczne wielkie litery</string>
+  <string name="pref_autocapitalisation_summary">Naciśnij Shift na początku zdania</string>
+  <string name="pref_switch_input_immediate_title">Przełącz na ostatnio używaną klawiaturę</string>
+  <string name="pref_switch_input_immediate_summary">Działanie klawisza przełączającego klawiaturę</string>
+  <string name="pref_vibrate_title">Wibracje</string>
+  <string name="pref_vibrate_summary">Wł./wył. wibrację przy naciśnięciu klawisza</string>
  <string name="pref_category_style">Styl</string>
  <string name="pref_margin_bottom_title">Margines dolny</string>
  <string name="pref_keyboard_height_title">Wysokość klawiatury</string>
@@ -51,7 +54,9 @@
  <string name="pref_theme_e_dark">Ciemny</string>
  <string name="pref_theme_e_light">Jasny</string>
  <string name="pref_theme_e_black">Czarny</string>
+  <string name="pref_theme_e_altblack">Alternatywny Czarny</string>
  <string name="pref_theme_e_white">Biały</string>
+  <string name="pref_theme_e_epaper">e-paper</string>
  <string name="pref_swipe_dist_e_very_short">Bardzo mała</string>
  <string name="pref_swipe_dist_e_short">Mała</string>
  <string name="pref_swipe_dist_e_default">Normalna</string>
@@ -62,10 +67,19 @@
  <string name="pref_category_advanced">Zaawansowane</string>
  <string name="pref_custom_layout_title">Własny układ</string>
  <string name="pref_custom_layout_summary">Zobacz kod źródłowy. Ta opcja nie jest przeznaczona do użycia.</string>
+  <string name="pref_vibration_e_disabled">Wyłączone</string>
+  <string name="pref_vibration_e_system">Systemowe</string>
+  <string name="pref_vibration_e_strong">Silne</string>
+  <string name="pref_vibration_e_medium">Normalne</string>
+  <string name="pref_vibration_e_light">Słabe</string>
  <string name="key_action_next">Dalej</string>
  <string name="key_action_done">OK</string>
  <string name="key_action_go">Przejdź</string>
  <string name="key_action_prev">Wstecz</string>
  <string name="key_action_search">Szukaj</string>
  <string name="key_action_send">Wyślij</string>
+  <string name="launcher_button_imesettings">Włącz klawiaturę</string>
+  <string name="launcher_description">Ta aplikacja jest klawiaturą ekranową. Naciśnij poniższy przycisk, aby przejść do ustawień systemu i włącz Unexpected-Keyboard.</string>
+  <string name="launcher_sourcecode">Jest to darmowa aplikacja o otwartym kodzie źródłowym. Możesz zobaczyć kod źródłowy oraz zgłosić błedy na <a href="https://github.com/Julow/Unexpected-Keyboard/">Githubie</a>.</string>
+  <string name="launcher_tryhere">Po jej włączeniu, możesz wypróbować klawiaturę tutaj:</string>
 </resources>
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -2,44 +2,47 @@
 <resources>
  <string name="app_name" product="debug">Teclado Unexpected</string>
  <string name="app_name" product="default">Teclado Unexpected</string>
-  <string name="settings_activity_label">Configurar Teclado Unexpected</string>
-  <!-- <string name="pref_portrait">In portrait mode</string> -->
-  <!-- <string name="pref_landscape">In landscape mode</string> -->
+  <string name="settings_activity_label">Configurações</string>
+  <string name="pref_portrait">No modo retrato</string>
+  <string name="pref_landscape">No modo paisagem</string>
  <string name="pref_category_layout">Layout</string>
-  <!-- <string name="pref_label_brightness">Adjust label brightness</string> -->
-  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
-  <!-- <string name="pref_key_opacity">Adjust key opacity</string> -->
-  <!-- <string name="pref_key_activated_opacity">Adjust pressed key opacity</string> -->
+  <string name="pref_label_brightness">Ajustar brilho dos rótulos</string>
+  <string name="pref_keyboard_opacity">Ajustar opacidade do fundo do teclado</string>
+  <string name="pref_key_opacity">Ajustar opacidade das teclas</string>
+  <string name="pref_key_activated_opacity">Ajustar opacidade das teclas pressionadas</string>
  <string name="pref_layout_title">Mudar layout do teclado</string>
  <string name="pref_layout_e_system">Mesmo do sistema</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
+  <string name="pref_layout_e_custom">Layout personalizado</string>
  <string name="pref_accents_title">Acentos</string>
  <string name="pref_accents_e_all_installed">Mostrar acentos para todos os idiomas instalados</string>
  <string name="pref_accents_e_selected">Mostrar acentos só para o idioma selecionado</string>
  <string name="pref_accents_e_none">Ocultar acentos</string>
-  <!-- <string name="pref_show_numpad_title">Show NumPad</string> -->
-  <!-- <string name="pref_show_numpad_never">Never</string> -->
-  <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
-  <!-- <string name="pref_show_numpad_always">Always</string> -->
-  <!-- <string name="pref_numpad_layout">NumPad layout</string> -->
-  <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
-  <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
-  <string name="pref_autocapitalisation_title">Maiusculização automática</string>
-  <string name="pref_autocapitalisation_summary">Aciona o shift no início de cada frase</string>
-  <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
-  <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
+  <string name="pref_show_numpad_title">Mostrar Teclado Numérico</string>
+  <string name="pref_show_numpad_never">Nunca</string>
+  <string name="pref_show_numpad_landscape">Somente no modo paisagem</string>
+  <string name="pref_show_numpad_always">Sempre</string>
+  <string name="pref_number_row_title">Mostrar fileira de números</string>
+  <string name="pref_number_row_summary">Adicionar uma linha de números no topo do teclado quando o teclado numérico estiver oculto</string>
+  <string name="pref_numpad_layout">Layout do teclado numérico</string>
+  <string name="pref_numpad_layout_e_high_first">Dígitos maiores primeiro</string>
+  <string name="pref_numpad_layout_e_low_first">Dígitos menores primeiro</string>
+  <string name="pref_extra_keys_title">Adicionar teclas ao teclado</string>
+  <string name="pref_second_layout_title">Layout secundário</string>
  <string name="pref_second_layout_none">Nenhum</string>
  <string name="pref_category_typing">Digitação</string>
  <string name="pref_swipe_dist_title">Distância a deslizar</string>
  <string name="pref_swipe_dist_summary">Distância até acionar os cantos das teclas (%s)</string>
  <string name="pref_long_timeout_title">Tempo até repetir tecla</string>
  <string name="pref_long_interval_title">Intervalo de repetição de tecla</string>
-  <string name="pref_vibrate_title">Vibração</string>
-  <string name="pref_vibrate_summary">Ativar/desativar vibração ao digitar</string>
-  <string name="pref_precise_repeat_title">Precisão nos movimentos do cursor</string>
-  <string name="pref_precise_repeat_summary">Varia a velocidade de repetição a depender do quanto deslizar</string>
  <string name="pref_lock_double_tap_title">Tecle duas vezes no shift para caixa alta</string>
  <string name="pref_lock_double_tap_summary">Ao invés de apertar e segurar por um tempo</string>
+  <string name="pref_category_behavior">Comportamento</string>
+  <string name="pref_autocapitalisation_title">Capitalização automática</string>
+  <string name="pref_autocapitalisation_summary">Aciona o shift no início de cada frase</string>
+  <string name="pref_switch_input_immediate_title">Alternar para o último teclado usado</string>
+  <string name="pref_switch_input_immediate_summary">Comportamento da tecla de troca de teclado</string>
+  <string name="pref_vibrate_title">Vibração</string>
+  <string name="pref_vibrate_summary">Ativar/desativar vibração ao digitar</string>
  <string name="pref_category_style">Estilo</string>
  <string name="pref_margin_bottom_title">Margem inferior</string>
  <string name="pref_keyboard_height_title">Altura do teclado</string>
@@ -51,7 +54,9 @@
  <string name="pref_theme_e_dark">Escuro</string>
  <string name="pref_theme_e_light">Claro</string>
  <string name="pref_theme_e_black">Preto</string>
-  <!-- <string name="pref_theme_e_white">White</string> -->
+  <string name="pref_theme_e_altblack">Preto Alternativo</string>
+  <string name="pref_theme_e_white">Branco</string>
+  <string name="pref_theme_e_epaper">Papel Eletrônico</string>
  <string name="pref_swipe_dist_e_very_short">Muito curto</string>
  <string name="pref_swipe_dist_e_short">Curto</string>
  <string name="pref_swipe_dist_e_default">Normal</string>
@@ -59,13 +64,22 @@
  <string name="pref_swipe_dist_e_very_far">Muito longo</string>
  <string name="pref_key_horizontal_space">Distância horizontal entre teclas</string>
  <string name="pref_key_vertical_space">Distância vertical entre teclas</string>
-  <!-- <string name="pref_category_advanced">Advanced</string> -->
-  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
-  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
+  <string name="pref_category_advanced">Avançado</string>
+  <string name="pref_custom_layout_title">Layout personalizado</string>
+  <string name="pref_custom_layout_summary">Veja o código-fonte. Esta opção não deve ser usada.</string>
+  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
+  <!-- <string name="pref_vibration_e_system">System</string> -->
+  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
+  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
+  <!-- <string name="pref_vibration_e_light">Light</string> -->
  <string name="key_action_next">Próximo</string>
  <string name="key_action_done">Pronto</string>
  <string name="key_action_go">Ir</string>
  <string name="key_action_prev">Anterior</string>
  <string name="key_action_search">Buscar</string>
  <string name="key_action_send">Enviar</string>
+  <string name="launcher_button_imesettings">Ativar teclado</string>
+  <string name="launcher_description">Este app é um teclado virtual. Vá para as configurações do sistema clicando no botão abaixo e ative o Teclado Unexpected.</string>
+  <string name="launcher_sourcecode">Este app é gratuito é de código aberto. Você pode consultar o código ou fazer sugestões em <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_tryhere">Após ativar, experimente aqui:</string>
 </resources>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name" product="debug">Tastatură Unexpected (depanare)</string>
+  <string name="app_name" product="default">Tastatură Unexpected</string>
+  <string name="settings_activity_label">Setări Tastatură Unexpected</string>
+  <string name="pref_portrait">În mod portret</string>
+  <string name="pref_landscape">În mod panoramă</string>
+  <string name="pref_category_layout">Aspect</string>
+  <string name="pref_label_brightness">Modifică luminozitatea denumirii</string>
+  <string name="pref_keyboard_opacity">Modifică opacitatea fundalului tastaturii</string>
+  <string name="pref_key_opacity">Modifică opacitatea tastelor</string>
+  <string name="pref_key_activated_opacity">Modifică opacitatea tastei apăsate</string>
+  <string name="pref_layout_title">Schimbă aranjamentul tastaturii</string>
+  <string name="pref_layout_e_system">Setări de Sistem</string>
+  <string name="pref_layout_e_custom">Aranjament personalizat</string>
+  <string name="pref_accents_title">Accente</string>
+  <string name="pref_accents_e_all_installed">Arată accentele pentru toate limbile instalate</string>
+  <string name="pref_accents_e_selected">Aratp accentele doar pentru limba selectată</string>
+  <string name="pref_accents_e_none">Ascunde accentele</string>
+  <string name="pref_show_numpad_title">Arată NumPad</string>
+  <string name="pref_show_numpad_never">Niciodată</string>
+  <string name="pref_show_numpad_landscape">Doar în mod panoramă</string>
+  <string name="pref_show_numpad_always">Întotdeanuna</string>
+  <string name="pref_number_row_title">Arată rândul cu numere</string>
+  <string name="pref_number_row_summary">Adaugă un rând deasupra tastaturii când numpad-ul este ascuns</string>
+  <string name="pref_numpad_layout">Aspect NumPad</string>
+  <string name="pref_numpad_layout_e_high_first">Mai întâi cifrele mari</string>
+  <string name="pref_numpad_layout_e_low_first">Mai întâi cifrele mici</string>
+  <string name="pref_extra_keys_title">Adaugă taste pe tastatură</string>
+  <string name="pref_second_layout_title">Aranjament secundar</string>
+  <string name="pref_second_layout_none">Nimic</string>
+  <string name="pref_category_typing">Tipărire</string>
+  <string name="pref_swipe_dist_title">Distanța de glisare</string>
+  <string name="pref_swipe_dist_summary">Distanța dintre caracterele din colțurile tastelor (%s)</string>
+  <string name="pref_long_timeout_title">Timeout pentru repetarea tastelor</string>
+  <string name="pref_long_interval_title">Intervalul de repetare a tastelor</string>
+  <string name="pref_lock_double_tap_title">Apăsare dublă pe Shift activează Caps Lock</string>
+  <string name="pref_lock_double_tap_summary">Puteți activa orice modificator, ținându-l apăsat</string>
+  <string name="pref_category_behavior">Comportament</string>
+  <string name="pref_autocapitalisation_title">Scriere automată cu majuscule</string>
+  <string name="pref_autocapitalisation_summary">Autoapăsare Shift la începutul fiecărei propoziții</string>
+  <string name="pref_switch_input_immediate_title">Schimbă la ultima tastatură folosită</string>
+  <string name="pref_switch_input_immediate_summary">Comportamentul tastei pentru schimbarea tastaturii</string>
+  <string name="pref_vibrate_title">Vibrație</string>
+  <string name="pref_vibrate_summary">Activați/dezactivați vibrația la apăsarea tastelor</string>
+  <string name="pref_category_style">Stil</string>
+  <string name="pref_margin_bottom_title">Marginea de jos</string>
+  <string name="pref_keyboard_height_title">Înălțimea tastaturii</string>
+  <string name="pref_horizontal_margin_title">Marginea orizontală</string>
+  <string name="pref_character_size_title">Dimensiunea simbolurilor</string>
+  <string name="pref_character_size_summary">Dimensiumea caracterelor afișate pe tastatură (%.2fx)</string>
+  <string name="pref_theme">Tema</string>
+  <string name="pref_theme_e_system">Setări de sistem</string>
+  <string name="pref_theme_e_dark">Întunecată</string>
+  <string name="pref_theme_e_light">Luminoasă</string>
+  <string name="pref_theme_e_black">Neagră</string>
+  <string name="pref_theme_e_altblack">Negru Alternativ</string>
+  <string name="pref_theme_e_white">Albă</string>
+  <string name="pref_theme_e_epaper">ePaper</string>
+  <string name="pref_swipe_dist_e_very_short">Foarte apropiată</string>
+  <string name="pref_swipe_dist_e_short">Apropiată</string>
+  <string name="pref_swipe_dist_e_default">Normală</string>
+  <string name="pref_swipe_dist_e_far">Depărtată</string>
+  <string name="pref_swipe_dist_e_very_far">Foarte depărtată</string>
+  <string name="pref_key_horizontal_space">Distanța orizontală dintre taste</string>
+  <string name="pref_key_vertical_space">Distanța verticală dintre taste</string>
+  <string name="pref_category_advanced">Setări avansate</string>
+  <string name="pref_custom_layout_title">Aranjament personalizat</string>
+  <string name="pref_custom_layout_summary">Deschide codul sursă. Această opțiune nu e destinată spre folosință.</string>
+  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
+  <!-- <string name="pref_vibration_e_system">System</string> -->
+  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
+  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
+  <!-- <string name="pref_vibration_e_light">Light</string> -->
+  <string name="key_action_next">Următor</string>
+  <string name="key_action_done">Gata</string>
+  <string name="key_action_go">Go</string>
+  <string name="key_action_prev">Precedent</string>
+  <string name="key_action_search">Caută</string>
+  <string name="key_action_send">Trimite</string>
+  <string name="launcher_button_imesettings">Activează tastatura</string>
+  <string name="launcher_description">Această aplicație este o tastatură virtuală. Accesați setările sistemului făcând clic pe butonul de mai jos și activați tastatura Unexpected.</string>
+  <string name="launcher_sourcecode">Aceasta este o aplicație gratuită și open source. Puteți găsi codul sursă sau raporta erori folosind link-ul <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_tryhere">După activare, puteți să încercați tastatura aici:</string>
+</resources>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
  <string name="app_name" product="debug">Unexpected Keyboard (отладка)</string>
-  <!-- <string name="app_name" product="default">Unexpected Keyboard</string> -->
+  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Unexpected Keyboard Настройки</string>
-  <!-- <string name="pref_portrait">In portrait mode</string> -->
-  <!-- <string name="pref_landscape">In landscape mode</string> -->
+  <string name="pref_portrait">В портретном режиме</string>
+  <string name="pref_landscape">В ландшафтном режиме</string>
  <string name="pref_category_layout">Расположение</string>
  <string name="pref_label_brightness">Изменить яркость клавиатуры</string>
  <string name="pref_keyboard_opacity">Изменить прозрачность фона</string>
@@ -21,11 +21,11 @@
  <string name="pref_show_numpad_never">Никогда</string>
  <string name="pref_show_numpad_landscape">Только в ландшафтном режиме</string>
  <string name="pref_show_numpad_always">Всегда</string>
+  <string name="pref_number_row_title">Показывать номер ряда</string>
+  <string name="pref_number_row_summary">Добавить ряд цифр над клавиатурой, когда numpad не активен</string>
  <string name="pref_numpad_layout">NumPad раскладка</string>
  <string name="pref_numpad_layout_e_high_first">Старшие цифры сверху</string>
  <string name="pref_numpad_layout_e_low_first">Младшие цифры сверху</string>
-  <string name="pref_autocapitalisation_title">Автоматическая смена регистра</string>
-  <string name="pref_autocapitalisation_summary">Автонажатие Shift в начале каждого предложения</string>
  <string name="pref_extra_keys_title">Добавить клавиши на клавиатуру</string>
  <string name="pref_second_layout_title">Дополнительная раскладка</string>
  <string name="pref_second_layout_none">Нет</string>
@@ -34,12 +34,15 @@
  <string name="pref_swipe_dist_summary">Расстояние между символами в углах клавиш (%s)</string>
  <string name="pref_long_timeout_title">Тайм-аут повтора клавиш</string>
  <string name="pref_long_interval_title">Интервал повтора клавиш</string>
-  <string name="pref_vibrate_title">Вибрация</string>
-  <string name="pref_vibrate_summary">Включение/выключение вибрации при нажатии клавиши</string>
-  <string name="pref_precise_repeat_title">Точные перемещения курсора</string>
-  <string name="pref_precise_repeat_summary">Изменяйте скорость повтора клавиш, проводя пальцем больше или меньше</string>
  <string name="pref_lock_double_tap_title">Двойное нажатие на Shift активирует Caps lock</string>
  <string name="pref_lock_double_tap_summary">Вы можете активировать модификатор, удерживая клавишу</string>
+  <string name="pref_category_behavior">Поведение</string>
+  <string name="pref_autocapitalisation_title">Автоматическая смена регистра</string>
+  <string name="pref_autocapitalisation_summary">Автонажатие Shift в начале каждого предложения</string>
+  <string name="pref_switch_input_immediate_title">Переключаться к последней используемой клавиатуре</string>
+  <string name="pref_switch_input_immediate_summary">Поведение клавиши переключения клавиатуры</string>
+  <string name="pref_vibrate_title">Вибрация</string>
+  <string name="pref_vibrate_summary">Включение/выключение вибрации при нажатии клавиши</string>
  <string name="pref_category_style">Стиль</string>
  <string name="pref_margin_bottom_title">Нижняя граница поля</string>
  <string name="pref_keyboard_height_title">Высота клавиатуры</string>
@@ -51,7 +54,9 @@
  <string name="pref_theme_e_dark">Темная</string>
  <string name="pref_theme_e_light">Светлая</string>
  <string name="pref_theme_e_black">Черная</string>
+  <string name="pref_theme_e_altblack">Альтернативный черный</string>
  <string name="pref_theme_e_white">Белая</string>
+  <string name="pref_theme_e_epaper">ePaper</string>
  <string name="pref_swipe_dist_e_very_short">Очень близко</string>
  <string name="pref_swipe_dist_e_short">Близко</string>
  <string name="pref_swipe_dist_e_default">Нормально</string>
@@ -62,10 +67,19 @@
  <string name="pref_category_advanced">Расширенные настройки</string>
  <string name="pref_custom_layout_title">Пользовательская раскладка</string>
  <string name="pref_custom_layout_summary">Откройте исходный код. Эта параметр не предназначен для использования.</string>
+  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
+  <!-- <string name="pref_vibration_e_system">System</string> -->
+  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
+  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
+  <!-- <string name="pref_vibration_e_light">Light</string> -->
  <string name="key_action_next">Далее</string>
  <string name="key_action_done">Ввод</string>
  <string name="key_action_go">Go</string>
  <string name="key_action_prev">Предыдущий</string>
  <string name="key_action_search">Поиск</string>
  <string name="key_action_send">Отправить</string>
+  <string name="launcher_button_imesettings">Включить клавиатуру</string>
+  <string name="launcher_description">Данное приложение является виртуальной клавиатурой. Зайдите в настройки, нажав кнопку внизу и активируйте Unexpected-Keyboard.</string>
+  <string name="launcher_sourcecode">Это бесплатное приложение с открытым исходным кодом. Вы можете изучить код или сообщить об ошибках по ссылке <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_tryhere">После активации вы можете попробовать клавиатуру прямо здесь:</string>
 </resources>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -21,11 +21,11 @@
  <!-- <string name="pref_show_numpad_never">Never</string> -->
  <!-- <string name="pref_show_numpad_landscape">Only in landscape mode</string> -->
  <!-- <string name="pref_show_numpad_always">Always</string> -->
+  <!-- <string name="pref_number_row_title">Show number row</string> -->
+  <!-- <string name="pref_number_row_summary">Add a number row at the top of the keyboard when the numpad is hidden</string> -->
  <!-- <string name="pref_numpad_layout">NumPad layout</string> -->
  <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
  <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
-  <!-- <string name="pref_autocapitalisation_title">Automatic capitalisation</string> -->
-  <!-- <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string> -->
  <!-- <string name="pref_extra_keys_title">Add keys to the keyboard</string> -->
  <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
  <string name="pref_second_layout_none">Hiçbiri</string>
@@ -34,12 +34,15 @@
  <string name="pref_swipe_dist_summary">Tuşların köşelerindeki karakterlerin uzaklıkları (%s)</string>
  <string name="pref_long_timeout_title">Tuş tekrarlama beklemesi</string>
  <string name="pref_long_interval_title">Tuş tekrarlama aralığı</string>
-  <string name="pref_vibrate_title">Titreşim</string>
-  <string name="pref_vibrate_summary">Tuşa basıldığında titreşimi etkinleştir</string>
-  <string name="pref_precise_repeat_title">İmleç hareketini ayarla</string>
-  <string name="pref_precise_repeat_summary">Tuş tekrar hızını az ya da çok kaydırarak ayarla</string>
  <!-- <string name="pref_lock_double_tap_title">Double tap on shift for caps lock</string> -->
  <!-- <string name="pref_lock_double_tap_summary">You can lock any modifier by holding it</string> -->
+  <!-- <string name="pref_category_behavior">Behavior</string> -->
+  <!-- <string name="pref_autocapitalisation_title">Automatic capitalisation</string> -->
+  <!-- <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string> -->
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
+  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
+  <string name="pref_vibrate_title">Titreşim</string>
+  <string name="pref_vibrate_summary">Tuşa basıldığında titreşimi etkinleştir</string>
  <string name="pref_category_style">Stil</string>
  <string name="pref_margin_bottom_title">Alt boşluk</string>
  <string name="pref_keyboard_height_title">Klavye yüksekliği</string>
@@ -51,7 +54,9 @@
  <string name="pref_theme_e_dark">Koyu</string>
  <string name="pref_theme_e_light">Açık</string>
  <string name="pref_theme_e_black">Siyah</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
  <!-- <string name="pref_theme_e_white">White</string> -->
+  <!-- <string name="pref_theme_e_epaper">ePaper</string> -->
  <string name="pref_swipe_dist_e_very_short">Çok kısa</string>
  <string name="pref_swipe_dist_e_short">Kısa</string>
  <string name="pref_swipe_dist_e_default">Normal</string>
@@ -62,10 +67,19 @@
  <!-- <string name="pref_category_advanced">Advanced</string> -->
  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
+  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
+  <!-- <string name="pref_vibration_e_system">System</string> -->
+  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
+  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
+  <!-- <string name="pref_vibration_e_light">Light</string> -->
  <string name="key_action_next">İleri</string>
  <string name="key_action_done">Bitti</string>
  <string name="key_action_go">İlerle</string>
  <string name="key_action_prev">Geri</string>
  <string name="key_action_search">Ara</string>
  <string name="key_action_send">Gönder</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
 </resources>
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name" product="debug">Unexpected Keyboard (gỡ lỗi)</string>
+  <string name="app_name" product="default">Unexpected Keyboard</string>
+  <string name="settings_activity_label">Cài đặt Unexpected Keyboard</string>
+  <string name="pref_portrait">Trong chế độ chân dung</string>
+  <string name="pref_landscape">Trong chế độ phong cảnh</string>
+  <string name="pref_category_layout">Bố cục</string>
+  <string name="pref_label_brightness">Tùy chỉnh độ sáng của phím</string>
+  <string name="pref_keyboard_opacity">Tùy chỉnh độ trong suốt của bàn phím</string>
+  <string name="pref_key_opacity">Tùy chỉnh độ trong suốt của phím</string>
+  <string name="pref_key_activated_opacity">Tùy chỉnh độ trong suốt của phím khi nhấn</string>
+  <string name="pref_layout_title">Thay đổi bố cục bàn phím</string>
+  <string name="pref_layout_e_system">Hệ thống</string>
+  <string name="pref_layout_e_custom">Tùy chỉnh bố cục</string>
+  <string name="pref_accents_title">Dấu phụ</string>
+  <string name="pref_accents_e_all_installed">Hiển thị cho các ngôn ngữ đã cài đặt</string>
+  <string name="pref_accents_e_selected">Chỉ hiển thị cho các ngôn ngữ đã chọn</string>
+  <string name="pref_accents_e_none">
+    Ẩn dấu phụ
+  </string>
+  <string name="pref_show_numpad_title">Hiện NumPad</string>
+  <string name="pref_show_numpad_never">Không bao giờ</string>
+  <string name="pref_show_numpad_landscape">Chỉ trong chế độ phong cảnh</string>
+  <string name="pref_show_numpad_always">Luôn luôn</string>
+  <string name="pref_number_row_title">Hiện số dòng</string>
+  <string name="pref_number_row_summary">Hiện số dòng trên đầu bàn phím khi NumPad ẩn</string>
+  <string name="pref_numpad_layout">Bố cục NumPad</string>
+  <string name="pref_numpad_layout_e_high_first">Số lớn nhất trước</string>
+  <string name="pref_numpad_layout_e_low_first">Số nhỏ nhất trước</string>
+  <string name="pref_extra_keys_title">Thêm phím vào bàn phím</string>
+  <string name="pref_second_layout_title">Bố cục phụ</string>
+  <string name="pref_second_layout_none">Không</string>
+  <string name="pref_category_typing">Gõ</string>
+  <string name="pref_swipe_dist_title">Khoảng cách vuốt</string>
+  <string name="pref_swipe_dist_summary">Khoảng cách giữa các ký tự ở góc phím (%s)</string>
+  <string name="pref_long_timeout_title">Thời hạn lặp phím</string>
+  <string name="pref_long_interval_title">Khoảng thời gian lặp phím</string>
+  <string name="pref_lock_double_tap_title">Nhấn hai lần Shift để bật Caps Lock</string>
+  <string name="pref_lock_double_tap_summary">Bạn có thể khóa phím hỗ trợ bằng cách giữ vào nó</string>
+  <!-- <string name="pref_category_behavior">Behavior</string> -->
+  <string name="pref_autocapitalisation_title">Tự động viết hoa</string>
+  <string name="pref_autocapitalisation_summary">Nhấn Shift ở đầu câu</string>
+  <!-- <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> -->
+  <!-- <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> -->
+  <string name="pref_vibrate_title">Sự rung</string>
+  <string name="pref_vibrate_summary">Bật/tắt rung khi nhấn</string>
+  <string name="pref_category_style">Kiểu cách</string>
+  <string name="pref_margin_bottom_title">Căn lề dưới</string>
+  <string name="pref_keyboard_height_title">Chiều cao bàn phím</string>
+  <string name="pref_horizontal_margin_title">Căn lề chiều ngang</string>
+  <string name="pref_character_size_title">Kích cỡ ký tự phím</string>
+  <string name="pref_character_size_summary">Kích cỡ các ký tự hiển thị trên bàn phím (%.2fx)</string>
+  <string name="pref_theme">Chủ đề</string>
+  <string name="pref_theme_e_system">Hệ thống</string>
+  <string name="pref_theme_e_dark">Tối</string>
+  <string name="pref_theme_e_light">Sáng</string>
+  <string name="pref_theme_e_black">Đen</string>
+  <!-- <string name="pref_theme_e_altblack">Alternative Black</string> -->
+  <string name="pref_theme_e_white">Trắng</string>
+  <string name="pref_theme_e_epaper">ePaper</string>
+  <string name="pref_swipe_dist_e_very_short">Rất gần</string>
+  <string name="pref_swipe_dist_e_short">Gần</string>
+  <string name="pref_swipe_dist_e_default">Trungbình</string>
+  <string name="pref_swipe_dist_e_far">Xa</string>
+  <string name="pref_swipe_dist_e_very_far">Rất xa</string>
+  <string name="pref_key_horizontal_space">Khoảng cách giữa các phím theo chiều ngang</string>
+  <string name="pref_key_vertical_space">Khoảng cách giữa các phím theo chiều dọc</string>
+  <string name="pref_category_advanced">Nâng cao</string>
+  <string name="pref_custom_layout_title">Tùy chỉnh bố cục</string>
+  <string name="pref_custom_layout_summary">Hãy xem mã nguồn. Lựa chọn này không có mục đích sử dụng.</string>
+  <!-- <string name="pref_vibration_e_disabled">Disabled</string> -->
+  <!-- <string name="pref_vibration_e_system">System</string> -->
+  <!-- <string name="pref_vibration_e_strong">Strong</string> -->
+  <!-- <string name="pref_vibration_e_medium">Medium</string> -->
+  <!-- <string name="pref_vibration_e_light">Light</string> -->
+  <string name="key_action_next">Tiếp</string>
+  <string name="key_action_done">Xong</string>
+  <string name="key_action_go">Đi</string>
+  <string name="key_action_prev">Trước</string>
+  <string name="key_action_search">Tìm</string>
+  <string name="key_action_send">Gửi</string>
+  <!-- <string name="launcher_button_imesettings">Enable keyboard</string> -->
+  <!-- <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string> -->
+  <!-- <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
+</resources>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -3,16 +3,16 @@
  <string name="app_name" product="debug">Unexpected Keyboard (debug)</string>
  <string name="app_name" product="default">Unexpected Keyboard</string>
  <string name="settings_activity_label">Unexpected Keyboard 设置</string>
-  <!-- <string name="pref_portrait">In portrait mode</string> -->
-  <!-- <string name="pref_landscape">In landscape mode</string> -->
+  <string name="pref_portrait">在竖屏模式下</string>
+  <string name="pref_landscape">在横屏模式下</string>
  <string name="pref_category_layout">布局</string>
  <string name="pref_label_brightness">调整字母亮度</string>
-  <!-- <string name="pref_keyboard_opacity">Adjust keyboard background opacity</string> -->
-  <!-- <string name="pref_key_opacity">Adjust key opacity</string> -->
-  <!-- <string name="pref_key_activated_opacity">Adjust pressed key opacity</string> -->
+  <string name="pref_keyboard_opacity">调整键盘背景透明度</string>
+  <string name="pref_key_opacity">调整按键透明度</string>
+  <string name="pref_key_activated_opacity">调整按下的按键的透明度</string>
  <string name="pref_layout_title">改变键盘布局</string>
  <string name="pref_layout_e_system">系统设置</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
+  <string name="pref_layout_e_custom">自定义布局</string>
  <string name="pref_accents_title">声调</string>
  <string name="pref_accents_e_all_installed">显示所有安装的语言的声调符号</string>
  <string name="pref_accents_e_selected">只显示选择的语言的声调符号</string>
@@ -21,11 +21,11 @@
  <string name="pref_show_numpad_never">从不</string>
  <string name="pref_show_numpad_landscape">只在横屏显示</string>
  <string name="pref_show_numpad_always">一直显示</string>
-  <!-- <string name="pref_numpad_layout">NumPad layout</string> -->
-  <!-- <string name="pref_numpad_layout_e_high_first">High digits first</string> -->
-  <!-- <string name="pref_numpad_layout_e_low_first">Low digits first</string> -->
-  <string name="pref_autocapitalisation_title">句首自动大写</string>
-  <string name="pref_autocapitalisation_summary">在句子的开头自动按下Shift</string>
+  <string name="pref_number_row_title">显示数字行</string>
+  <string name="pref_number_row_summary">当数字小键盘隐藏时，在键盘上方显示数字按键</string>
+  <string name="pref_numpad_layout">数字小键盘布局</string>
+  <string name="pref_numpad_layout_e_high_first">大数字在上方</string>
+  <string name="pref_numpad_layout_e_low_first">小数字在上方</string>
  <string name="pref_extra_keys_title">选择要显示的按键</string>
  <string name="pref_second_layout_title">第二键盘布局</string>
  <string name="pref_second_layout_none">无</string>
@@ -34,12 +34,15 @@
  <string name="pref_swipe_dist_summary">输入按键四角的符号需要滑动的距离 (%s)</string>
  <string name="pref_long_timeout_title">长按到开始重复输入的时间</string>
  <string name="pref_long_interval_title">长按后每次重复输入的时间间隔</string>
-  <string name="pref_vibrate_title">振动</string>
-  <string name="pref_vibrate_summary">启用或者禁用按下按键时振动</string>
-  <string name="pref_precise_repeat_title">精确控制光标移速</string>
-  <string name="pref_precise_repeat_summary">按键重复按下速度由手指滑动的距离决定</string>
  <string name="pref_lock_double_tap_title">双击Shift键锁定大写</string>
  <string name="pref_lock_double_tap_summary">任何时候都可以长按修改键以锁定</string>
+  <string name="pref_category_behavior">行为</string>
+  <string name="pref_autocapitalisation_title">句首自动大写</string>
+  <string name="pref_autocapitalisation_summary">在句子的开头自动按下Shift</string>
+  <string name="pref_switch_input_immediate_title">切换到最近使用的键盘</string>
+  <string name="pref_switch_input_immediate_summary">切换键盘按钮的行为</string>
+  <string name="pref_vibrate_title">振动</string>
+  <string name="pref_vibrate_summary">启用或者禁用按下按键时振动</string>
  <string name="pref_category_style">样式</string>
  <string name="pref_margin_bottom_title">键盘下边距</string>
  <string name="pref_keyboard_height_title">键盘高度</string>
@@ -51,7 +54,9 @@
  <string name="pref_theme_e_dark">暗色</string>
  <string name="pref_theme_e_light">亮色</string>
  <string name="pref_theme_e_black">黑色</string>
+  <string name="pref_theme_e_altblack">黑色带边框</string>
  <string name="pref_theme_e_white">白色</string>
+  <string name="pref_theme_e_epaper">白色带边框</string>
  <string name="pref_swipe_dist_e_very_short">非常短</string>
  <string name="pref_swipe_dist_e_short">短</string>
  <string name="pref_swipe_dist_e_default">中（默认）</string>
@@ -59,13 +64,22 @@
  <string name="pref_swipe_dist_e_very_far">非常长</string>
  <string name="pref_key_horizontal_space">按键的左右边距</string>
  <string name="pref_key_vertical_space">按键的上下边距</string>
-  <!-- <string name="pref_category_advanced">Advanced</string> -->
-  <!-- <string name="pref_custom_layout_title">Custom layout</string> -->
-  <!-- <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string> -->
+  <string name="pref_category_advanced">高级设置</string>
+  <string name="pref_custom_layout_title">自定义布局</string>
+  <string name="pref_custom_layout_summary">请查看源代码。这个选项不应该在正常情况下使用。</string>
+  <string name="pref_vibration_e_disabled">禁用</string>
+  <string name="pref_vibration_e_system">使用系统振动强度</string>
+  <string name="pref_vibration_e_strong">强</string>
+  <string name="pref_vibration_e_medium">中</string>
+  <string name="pref_vibration_e_light">弱</string>
  <string name="key_action_next">下一项</string>
  <string name="key_action_done">完成</string>
  <string name="key_action_go">前往</string>
  <string name="key_action_prev">前一项</string>
  <string name="key_action_search">搜索</string>
  <string name="key_action_send">发送</string>
+  <string name="launcher_button_imesettings">启用键盘</string>
+  <string name="launcher_description">这是一个虚拟键盘软件。点击按钮进入系统设置，然后启用 Unexpected-Keyboard 即可使用。</string>
+  <string name="launcher_sourcecode">这是一个免费且开源的软件。你可以在 <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a> 上找到源代码或者反馈 bug。</string>
+  <string name="launcher_tryhere">启用键盘后，可以在这里测试效果：</string>
 </resources>
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,65 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string-array name="pref_layout_values">
-    <item>none</item>
-    <item>azerty</item>
-    <item>qwerty</item>
-    <item>qwerty_pt</item>
-    <item>qwerty_es</item>
-    <item>qwerty_el</item>
-    <item>qwerty_ko</item>
-    <item>qwerty_lv</item>
-    <item>qwerty_no</item>
-    <item>qwerty_sv_se</item>
-    <item>qwerty_hu</item>
-    <item>qwerty_tr</item>
-    <item>qwerty_pl</item>
-    <item>ru_jcuken</item>
-    <item>qwertz</item>
-    <item>qwertz_cs</item>
-    <item>qwertz_de</item>
-    <item>qwertz_hu</item>
-    <item>qwertz_sk</item>
-    <item>bgph1</item>
-    <item>dvorak</item>
-    <item>colemak</item>
-    <item>neo2</item>
-    <item>bone</item>
-    <item>jcuken_ua</item>
-    <item>bangla</item>
-    <item>hindi</item>
-    <item>custom</item>
-  </string-array>
-  <string-array name="pref_layout_entries">
-    <item>None</item>
-    <item>AZERTY</item>
-    <item>QWERTY</item>
-    <item>QWERTY (Brasileiro)</item>
-    <item>QWERTY (Español)</item>
-    <item>QWERTY (Greek)</item>
-    <item>QWERTY (Korean)</item>
-    <item>QWERTY (Latvian)</item>
-    <item>QWERTY (Norwegian)</item>
-    <item>QWERTY (Swedish)</item>
-    <item>QWERTY (Hungarian)</item>
-    <item>QWERTY (Türkçe)</item>
-    <item>QWERTY (Polski)</item>
-    <item>ЙЦУКЕН (Русский)</item>
-    <item>QWERTZ</item>
-    <item>QWERTZ (Czech)</item>
-    <item>QWERTZ (Deutsch)</item>
-    <item>QWERTZ (Hungarian)</item>
-    <item>QWERTZ (Slovak)</item>
-    <item>Bulgarian (Phonetic Traditional)</item>
-    <item>Dvorak</item>
-    <item>Colemak</item>
-    <item>Neo 2</item>
-    <item>Bone</item>
-    <item>ЙЦУКЕН (Українська)</item>
-    <item>বাংলা</item>
-    <item>हिन्दी</item>
-    <item>@string/pref_layout_e_custom</item>
-  </string-array>
  <string-array name="pref_accents_entries">
    <item>@string/pref_accents_e_all_installed</item>
    <item>@string/pref_accents_e_selected</item>
@@ -93,14 +33,18 @@
    <item>@string/pref_theme_e_dark</item>
    <item>@string/pref_theme_e_light</item>
    <item>@string/pref_theme_e_black</item>
+    <item>@string/pref_theme_e_altblack</item>
    <item>@string/pref_theme_e_white</item>
+    <item>@string/pref_theme_e_epaper</item>
  </string-array>
  <string-array name="pref_theme_values">
    <item>system</item>
    <item>dark</item>
    <item>light</item>
    <item>black</item>
+    <item>altblack</item>
    <item>white</item>
+    <item>epaper</item>
  </string-array>
  <string-array name="pref_swipe_dist_entries">
    <item>@string/pref_swipe_dist_e_very_short</item>
@@ -116,4 +60,18 @@
    <item>25</item>
    <item>35</item>
  </string-array>
+  <string-array name="pref_vibration_entries">
+    <item>@string/pref_vibration_e_disabled</item>
+    <item>@string/pref_vibration_e_system</item>
+    <item>@string/pref_vibration_e_strong</item>
+    <item>@string/pref_vibration_e_medium</item>
+    <item>@string/pref_vibration_e_light</item>
+  </string-array>
+  <string-array name="pref_vibration_values">
+    <item>disabled</item>
+    <item>system</item>
+    <item>strong</item>
+    <item>medium</item>
+    <item>light</item>
+  </string-array>
 </resources>
--- a/res/values/layouts.xml
+++ b/res/values/layouts.xml
@@ -0,0 +1,127 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--DO NOT EDIT. This file is generated, see gen_layouts.py.-->
+  <string-array name="pref_layout_values">
+    <item>none</item>
+    <item>latn_qwerty_us</item>
+    <item>latn_colemak</item>
+    <item>latn_dvorak</item>
+    <item>arab_alt</item>
+    <item>arab_pc</item>
+    <item>arab_pc_ckb</item>
+    <item>arab_pc_ir</item>
+    <item>beng_national</item>
+    <item>beng_provat</item>
+    <item>cyrl_jcuken_ru</item>
+    <item>cyrl_jcuken_uk</item>
+    <item>cyrl_yaverti</item>
+    <item>deva_alt</item>
+    <item>deva_inscript</item>
+    <item>grek_qwerty</item>
+    <item>hang_dubeolsik_kr</item>
+    <item>hebr_1_il</item>
+    <item>hebr_2_il</item>
+    <item>latn_azerty_fr</item>
+    <item>latn_bone</item>
+    <item>latn_neo2</item>
+    <item>latn_qwerty_br</item>
+    <item>latn_qwerty_es</item>
+    <item>latn_qwerty_hu</item>
+    <item>latn_qwerty_lv</item>
+    <item>latn_qwerty_no</item>
+    <item>latn_qwerty_pl</item>
+    <item>latn_qwerty_ro</item>
+    <item>latn_qwerty_se</item>
+    <item>latn_qwerty_tr</item>
+    <item>latn_qwerty_vi</item>
+    <item>latn_qwertz</item>
+    <item>latn_qwertz_cz</item>
+    <item>latn_qwertz_cz_multifunctional</item>
+    <item>latn_qwertz_de</item>
+    <item>latn_qwertz_hu</item>
+    <item>latn_qwertz_sk</item>
+    <item>custom</item>
+  </string-array>
+  <string-array name="pref_layout_entries">
+    <item>None</item>
+    <item>QWERTY (US)</item>
+    <item>Colemak</item>
+    <item>Dvorak</item>
+    <item>Arabic Alt</item>
+    <item>Arabic PC</item>
+    <item>Arabic (کوردی)</item>
+    <item>Persian PC</item>
+    <item>বাংলা (জাতীয়)</item>
+    <item>বাংলা (প্রভাত)</item>
+    <item>ЙЦУКЕН (Русский)</item>
+    <item>ЙЦУКЕН (Українська)</item>
+    <item>ЯВЕРТЪ</item>
+    <item>देवनागरी (हिंदी)-2</item>
+    <item>देवनागरी (हिंदी)-1</item>
+    <item>QWERTY (Greek)</item>
+    <item>두벌식 (Korean)</item>
+    <item>Hebrew 1</item>
+    <item>Hebrew 2</item>
+    <item>AZERTY (Français)</item>
+    <item>Bone</item>
+    <item>Neo 2</item>
+    <item>QWERTY (Brasileiro)</item>
+    <item>QWERTY (Español)</item>
+    <item>QWERTY (Magyar)</item>
+    <item>QWERTY (Latvian)</item>
+    <item>QWERTY (Norwegian)</item>
+    <item>QWERTY (Polski)</item>
+    <item>QWERTY (Română)</item>
+    <item>QWERTY (Swedish)</item>
+    <item>QWERTY (Türkçe)</item>
+    <item>QWERTY (Vietnamese)</item>
+    <item>QWERTZ</item>
+    <item>QWERTZ (Czech)</item>
+    <item>QWERTZ Multifunctional (Czech)</item>
+    <item>QWERTZ (Deutsch)</item>
+    <item>QWERTZ (Magyar)</item>
+    <item>QWERTZ (Slovak)</item>
+    <item>@string/pref_layout_e_custom</item>
+  </string-array>
+  <integer-array name="layout_ids">
+    <item>-1</item>
+    <item>@xml/latn_qwerty_us</item>
+    <item>@xml/latn_colemak</item>
+    <item>@xml/latn_dvorak</item>
+    <item>@xml/arab_alt</item>
+    <item>@xml/arab_pc</item>
+    <item>@xml/arab_pc_ckb</item>
+    <item>@xml/arab_pc_ir</item>
+    <item>@xml/beng_national</item>
+    <item>@xml/beng_provat</item>
+    <item>@xml/cyrl_jcuken_ru</item>
+    <item>@xml/cyrl_jcuken_uk</item>
+    <item>@xml/cyrl_yaverti</item>
+    <item>@xml/deva_alt</item>
+    <item>@xml/deva_inscript</item>
+    <item>@xml/grek_qwerty</item>
+    <item>@xml/hang_dubeolsik_kr</item>
+    <item>@xml/hebr_1_il</item>
+    <item>@xml/hebr_2_il</item>
+    <item>@xml/latn_azerty_fr</item>
+    <item>@xml/latn_bone</item>
+    <item>@xml/latn_neo2</item>
+    <item>@xml/latn_qwerty_br</item>
+    <item>@xml/latn_qwerty_es</item>
+    <item>@xml/latn_qwerty_hu</item>
+    <item>@xml/latn_qwerty_lv</item>
+    <item>@xml/latn_qwerty_no</item>
+    <item>@xml/latn_qwerty_pl</item>
+    <item>@xml/latn_qwerty_ro</item>
+    <item>@xml/latn_qwerty_se</item>
+    <item>@xml/latn_qwerty_tr</item>
+    <item>@xml/latn_qwerty_vi</item>
+    <item>@xml/latn_qwertz</item>
+    <item>@xml/latn_qwertz_cz</item>
+    <item>@xml/latn_qwertz_cz_multifunctional</item>
+    <item>@xml/latn_qwertz_de</item>
+    <item>@xml/latn_qwertz_hu</item>
+    <item>@xml/latn_qwertz_sk</item>
+    <item>-1</item>
+  </integer-array>
+</resources>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,11 +21,11 @@
  <string name="pref_show_numpad_never">Never</string>
  <string name="pref_show_numpad_landscape">Only in landscape mode</string>
  <string name="pref_show_numpad_always">Always</string>
+  <string name="pref_number_row_title">Show number row</string>
+  <string name="pref_number_row_summary">Add a number row at the top of the keyboard when the numpad is hidden</string>
  <string name="pref_numpad_layout">NumPad layout</string>
  <string name="pref_numpad_layout_e_high_first">High digits first</string>
  <string name="pref_numpad_layout_e_low_first">Low digits first</string>
-  <string name="pref_autocapitalisation_title">Automatic capitalisation</string>
-  <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string>
  <string name="pref_extra_keys_title">Add keys to the keyboard</string>
  <string name="pref_second_layout_title">Secondary layout</string>
  <string name="pref_second_layout_none">None</string>
@@ -34,12 +34,15 @@
  <string name="pref_swipe_dist_summary">Distance of characters in the corners of the keys (%s)</string>
  <string name="pref_long_timeout_title">Key repeat timeout</string>
  <string name="pref_long_interval_title">Key repeat interval</string>
-  <string name="pref_vibrate_title">Vibration</string>
-  <string name="pref_vibrate_summary">Enable/disable vibration on keypress</string>
-  <string name="pref_precise_repeat_title">Precise cursor movements</string>
-  <string name="pref_precise_repeat_summary">Modulate key repeat speed by swiping more or less</string>
  <string name="pref_lock_double_tap_title">Double tap on shift for caps lock</string>
  <string name="pref_lock_double_tap_summary">You can lock any modifier by holding it</string>
+  <string name="pref_category_behavior">Behavior</string>
+  <string name="pref_autocapitalisation_title">Automatic capitalisation</string>
+  <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string>
+  <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string>
+  <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string>
+  <string name="pref_vibrate_title">Vibration</string>
+  <string name="pref_vibrate_summary">Enable/disable vibration on keypress</string>
  <string name="pref_category_style">Style</string>
  <string name="pref_margin_bottom_title">Margin bottom</string>
  <string name="pref_keyboard_height_title">Keyboard height</string>
@@ -51,7 +54,9 @@
  <string name="pref_theme_e_dark">Dark</string>
  <string name="pref_theme_e_light">Light</string>
  <string name="pref_theme_e_black">Black</string>
+  <string name="pref_theme_e_altblack">Alternative Black</string>
  <string name="pref_theme_e_white">White</string>
+  <string name="pref_theme_e_epaper">ePaper</string>
  <string name="pref_swipe_dist_e_very_short">Very short</string>
  <string name="pref_swipe_dist_e_short">Short</string>
  <string name="pref_swipe_dist_e_default">Normal</string>
@@ -62,10 +67,19 @@
  <string name="pref_category_advanced">Advanced</string>
  <string name="pref_custom_layout_title">Custom layout</string>
  <string name="pref_custom_layout_summary">See the source code. This option is not meant to be used.</string>
+  <string name="pref_vibration_e_disabled">Disabled</string>
+  <string name="pref_vibration_e_system">System</string>
+  <string name="pref_vibration_e_strong">Strong</string>
+  <string name="pref_vibration_e_medium">Medium</string>
+  <string name="pref_vibration_e_light">Light</string>
  <string name="key_action_next">Next</string>
  <string name="key_action_done">Done</string>
  <string name="key_action_go">Go</string>
  <string name="key_action_prev">Prev</string>
  <string name="key_action_search">Search</string>
  <string name="key_action_send">Send</string>
+  <string name="launcher_button_imesettings">Enable keyboard</string>
+  <string name="launcher_description">This application is a virtual keyboard. Go to the system settings by clicking on the button below and enable Unexpected-Keyboard.</string>
+  <string name="launcher_sourcecode">This is an free and open source application. You can find the source code or report bugs on <a href="https://github.com/Julow/Unexpected-Keyboard/">Github</a>.</string>
+  <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string>
 </resources>
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -24,4 +24,11 @@
    <item name="android:textSize">@dimen/emoji_text_size</item>
    <item name="android:textColor">?attr/emoji_color</item>
  </style>
+  <style name="paragraph">
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginVertical">8dp</item>
+    <item name="android:layout_marginHorizontal">16dp</item>
+    <item name="android:layout_gravity">center</item>
+  </style>
 </resources>
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -96,6 +96,9 @@
    <item name="emoji_button_bg">#000000</item>
    <item name="emoji_color">#ffffff</item>
  </style>
+  <style name="AltBlack" parent="Black">
+    <item name="keyBorderWidth">1dp</item>
+  </style>
  <style name="White" parent="BaseTheme">
    <item name="android:isLightTheme">true</item>
    <item name="colorKeyboard">#ffffff</item>
@@ -115,4 +118,23 @@
    <item name="emoji_button_bg">#ffffff</item>
    <item name="emoji_color">#000000</item>
  </style>
+  <style name="ePaper" parent="BaseTheme">
+    <item name="android:isLightTheme">true</item>
+    <item name="colorKeyboard">#ffffff</item>
+    <item name="colorKey">#ffffff</item>
+    <item name="keyBorderWidth">2dp</item>
+    <item name="keyBorderWidthActivated">5dp</item>
+    <item name="keyBorderColorLeft">#000000</item>
+    <item name="keyBorderColorTop">#000000</item>
+    <item name="keyBorderColorRight">#000000</item>
+    <item name="keyBorderColorBottom">#000000</item>
+    <item name="colorKeyActivated">#ffffff</item>
+    <item name="colorLabel">#000000</item>
+    <item name="colorLabelActivated">#000000</item>
+    <item name="colorLabelLocked">#33cc33</item>
+    <item name="colorSubLabel">#333333</item>
+    <item name="secondaryLightOffset">+0.35</item>
+    <item name="emoji_button_bg">#ffffff</item>
+    <item name="emoji_color">#000000</item>
+  </style>
 </resources>
--- a/res/values/values.xml
+++ b/res/values/values.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <dimen name="horizontal_margin">3dp</dimen>
  <dimen name="margin_top">3dp</dimen>
-  <dimen name="margin_bottom">7dp</dimen>
  <dimen name="key_padding">2dp</dimen>
-  <dimen name="key_vertical_interval">2dp</dimen>
-  <dimen name="key_horizontal_interval">2dp</dimen>
  <dimen name="emoji_type_button_height">56dp</dimen>
  <dimen name="emoji_grid_height">250dp</dimen>
  <dimen name="emoji_text_size">28dp</dimen>
--- a/res/xml/arab_alt.xml
+++ b/res/xml/arab_alt.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard name="Arabic Alt" script="arabic">
+  <row>
+    <key key0="ض" key2="١" key3="`" key4="esc"/>
+    <key key0="ص" key2="٢" key3="\@"/>
+    <key key0="ث" key2="٣" key3="\#"/>
+    <key key0="ق" key2="٤" key3="$"/>
+    <key key0="ف" key2="٥" key3="%"/>
+    <key key0="غ" key2="٦" key3="^"/>
+    <key key0="ع" key2="٧" key3="&amp;"/>
+    <key key0="ه" key2="٨" key3="*"/>
+    <key key0="خ" key2="٩" key3="("/>
+    <key key0="ح" key2="٠" key3=")"/>
+    <key key0="ج"/>
+  </row>
+  <row>
+    <key key0="ش" key4="tab"/>
+    <key key0="س"/>
+    <key key0="ي"/>
+    <key key0="ب"/>
+    <key key0="ل"/>
+    <key key0="ا" key1="أ"/>
+    <key key0="ت"/>
+    <key key0="ن"/>
+    <key key0="م"/>
+    <key key0="ك"/>
+    <key key0="ط"/>
+  </row>
+  <row>
+    <key key0="ذ"/>
+    <key key0="ء"/>
+    <key key0="ؤ" key1="{"/>
+    <key key0="ر" key1="}"/>
+    <key key0="ى" key1="ئ"/>
+    <key key0="ة"/>
+    <key key0="و" key3=","/>
+    <key key0="ز" key3="."/>
+    <key key0="ظ" key3="&#1567;"/>
+    <key key0="د"/>
+    <key width="1.0" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
--- a/res/xml/arab_pc.xml
+++ b/res/xml/arab_pc.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard name="Arabic PC" script="arabic">
+  <row>
+    <key key0="ض" key1="&#1614;" key2="١" key3="`" key4="esc"/>
+    <key key0="ص" key1="&#1611;" key2="٢" key3="\@"/>
+    <key key0="ث" key1="&#1615;" key2="٣" key3="\#" key4="loc €"/>
+    <key key0="ق" key1="&#1612;" key2="٤" key3="$" key4="loc £"/>
+    <key key0="ف" key1="&#1604;&#1573;" key2="٥" key3="%"/>
+    <key key0="غ" key1="&#1573;" key2="٦" key3="^"/>
+    <key key0="ع" key1="&#8216;" key2="٧" key3="&amp;"/>
+    <key key0="ه" key1="&#0247;" key2="٨" key3="*"/>
+    <key key0="خ" key1="&#0215;" key2="٩" key3="("/>
+    <key key0="ح" key1="&#1563;" key2="٠" key3=")"/>
+    <key key0="ج" key1="&gt;" key2="-" key3="_"/>
+    <key key0="د" key1="&lt;" key2="=" key3="ذ"/>
+    <!-- <key key0="ذ" key1="&#1617;" key3="\\" key4="|"/> -->
+  </row>
+  <row>
+    <key shift="0.5" key0="ش" key1="&#1616;" key4="tab"/>
+    <key key0="س" key1="&#1613;"/>
+    <key key0="ي" key1="["/>
+    <key key0="ب" key1="]"/>
+    <key key0="ل" key1="&#1604;&#1571;"/>
+    <key key0="ا" key1="أ"/>
+    <key key0="ت" key1="ـ"/>
+    <key key0="ن" key1="&#1548;"/>
+    <key key0="م" key1="/"/>
+    <key key0="ك" key1=":"/>
+    <key key0="ط" key1="&quot;"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="ئ" key1="~"/>
+    <key key0="ء" key1="&#1618;"/>
+    <key key0="ؤ" key1="{"/>
+    <key key0="ر" key1="}"/>
+    <key key0="لا" key1="&#1604;&#1570;"/>
+    <key key0="ى" key1="&#1570;"/>
+    <key key0="ة" key1="&#8217;"/>
+    <key key0="و" key1=","/>
+    <key key0="ز" key1="."/>
+    <key key0="ظ" key1="&#1567;"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
--- a/res/xml/arab_pc_ckb.xml
+++ b/res/xml/arab_pc_ckb.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard name="Arabic (کوردی)" script="arabic">
+  <row>
+    <key key0="ق" key1="ٯ" key2="١" key3="esc"/>
+    <key key0="و" key1="وو" key2="٢" key3="\@"/>
+    <key key0="ە" key1="ة" key2="٣" key3="\#" />
+    <key key0="ر" key1="ڕ" key2="٤" key3="$"/>
+    <key key0="ت" key1="ط" key2="٥" key3="٪"/>
+    <key key0="ی" key1="ي" key2="٦" key3="^"/>
+    <key key0="ێ" key1="ؽ" key2="٧" key3="&amp;"/>
+    <key key0="ئ" key1="ء" key2="٨" key3="*"/>
+    <key key0="ۆ" key1="ؤ" key2="٩" key3=")" key4="("/>
+    <key key0="پ" key1="ث" key2="٠"/>
+  </row>
+  <row>
+    <key key0="ا" key1="أ" key2="tab"/>
+    <key key0="س" key1="ص"/>
+    <key key0="ش" key1="ض"/>
+    <key key0="د" key1="ذ" key2="ۮ"/>
+    <key key0="ف" key1="ڤ" key2="-" key3="_"/>
+    <key key0="ه" key2="ھ" key3="ـہ"/>
+    <key key0="ژ" key1="ـ" key4="}" key3="{"/>
+    <key key0="ل" key1="ڵ" key3="]" key4="["/>
+    <key key0="ک" key2="ك" key3="\\"/>
+    <key key0="گ" key2="غ" key3="/"/>
+  </row>
+  <row>
+    <key key0="ز" key1="ظ"/>
+    <key key0="خ"/>
+    <key key0="ج"/>
+    <key key0="چ"/>
+    <key key0="ح" key1="&#1567;" key3="!"/>
+    <key key0="ع" />
+    <key key0="ب"/>
+    <key key0="ن" key2="&#1548;" key3="&#1563;"/>
+    <key key0="م"/>
+    <key key0="backspace" key2="delete" key3="f11_placeholder" key4="f12_placeholder"/>
+  </row>
+</keyboard>
--- a/res/xml/arab_pc_ir.xml
+++ b/res/xml/arab_pc_ir.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Adapted from standard SIRI 9147 -->
+<keyboard name="Persian PC" script="arabic">
+  <row>
+    <key key0="ض" key2="۱"/>
+    <key key0="ص" key2="۲"/>
+    <key key0="ث" key2="۳"/>
+    <key key0="ق" key2="۴"/>
+    <key key0="ف" key2="۵"/>
+    <key key0="غ" key1="۶" key2="،"/>
+    <key key0="ع" key1="۷"/>
+    <key key0="ه" key1="۸"/>
+    <key key0="خ" key1="۹"/>
+    <key key0="ح" key1="۰"/>
+    <key key0="ج"/>
+  </row>
+  <row>
+    <key key0="ش" key2="\@"/>
+    <key key0="س" key2="\#"/>
+    <key key0="ی" key2="﷼"/>
+    <key key0="ب" key2="٪"/>
+    <key key0="ل" key2="&amp;"/>
+    <key key0="ا" key1="آ" key2="ء" key4="-"/>
+    <key key0="ت" key1="&#x200C;" key2="+"/>
+    <key key0="ن" key1="("/>
+    <key key0="م" key1=")"/>
+    <key key0="ک"/>
+    <key key0="گ"/>
+  </row>
+  <row>
+    <key key0="ظ" key2="&#1567;"/>
+    <key key0="ط"/>
+    <key key0="ز" key2="«"/>
+    <key key0="ر" key2="»"/>
+    <key key0="ژ" key2="."/>
+    <key key0="ذ" key2=":"/>
+    <key key0="د" key1="؛"/>
+    <key key0="پ" key1="!"/>
+    <key key0="و" key1="ـ"/>
+    <key key0="چ"/>
+    <key width="1.0" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
--- a/res/xml/beng_national.xml
+++ b/res/xml/beng_national.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="বাংলা (জাতীয়)">
  <row>
    <key key0="ঙ" key2="ং" key3="esc" key4="১"/>
    <key key0="য" key2="য়" key3="¶" key4="২"/>
--- a/res/xml/beng_provat.xml
+++ b/res/xml/beng_provat.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<keyboard name="বাংলা (প্রভাত)">
+	<row>
+		<key 				key0="দ"	key1="ধ"	key2="১"	key3="!"				key5="esc"	/>
+		<key 				key0="ূ"		key1="ঊ"	key2="২"	key3="\@"							/>
+		<key 				key0="ী"		key1="ঈ"	key2="৩"	key3="\#"							/>
+		<key 				key0="র"	key1="ড়"	key2="৪"	key3="৳"							/>
+		<key 				key0="ট"		key1="ঠ"	key2="৫"	key3="%"							/>
+		<key 				key0="এ"	key1="ঐ"	key2="৬"	key3="^"							/>
+		<key 				key0="ু"		key1="উ"	key2="৭"	key3="ঞ"							/>
+		<key 				key0="ি"		key1="ই"		key2="৮"	key3="ৎ"								/>
+		<key 				key0="ও"	key1="ঔ"	key2="৯"	key3="("	key4=")"				/>
+		<key 				key0="প"	key1="ফ"	key2="০"	key3="zwj"	key4="~"				/>
+	</row>
+	<row>
+		<key shift="0.5"	key0="া"		key1="অ"										key5="tab"	/>
+		<key 				key0="স"	key1="ষ"													/>
+		<key 				key0="ড"	key1="ঢ"														/>
+		<key 				key0="ত"	key1="থ"													/>
+		<key 				key0="গ"	key1="ঘ"	key2="-"	key3="_"							/>
+		<key 				key0="হ"		key1="ঃ"		key2="="	key3="+"							/>
+		<key 				key0="জ"	key1="ঝ"				key3="ে"		key4="ৈ"					/>
+		<key 				key0="ক"	key1="খ"				key3="ো"	key4="ৌ"				/>
+		<key 				key0="ল"	key1="ং"		key2="॥"		key3="zwnj"							/>
+	</row>
+	<row>
+		<key width="1.5"	key0="shift"															/>
+		<key 				key0="য়"	key1="য"													/>
+		<key 				key0="শ"	key1="ঢ়"														/>
+		<key 				key0="চ"		key1="ছ"	key2="ৃ"			key3=","						/>
+		<key 				key0="আ"	key1="ঋ"	key2="ঁ"			key3="।"							/>
+		<key 				key0="ব"	key1="ভ"	key2="\?"		key3="্"							/>
+		<key 				key0="ন"	key1="ণ"	key2=":"		key3=";"						/>
+		<key 				key0="ম"	key1="ঙ"	key2="&quot;"	key3="'"						/>
+		<key width="1.5"	key0="backspace"		key2="delete"									/>
+	</row>
+</keyboard>
--- a/res/xml/bottom_row.xml
+++ b/res/xml/bottom_row.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <row height="0.95">
-  <key width="1.8" key0="ctrl" key1="loc switch_greekmath" key2="loc meta" key4="switch_numeric"/>
-  <key width="1.2" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
-  <key width="4.0" key0="space" key1="switch_second" edgekeys="true"/>
-  <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
-  <key width="1.8" key0="enter" key2="action"/>
+  <key width="1.7" key0="ctrl" key1="loc switch_greekmath" key2="loc meta" key4="switch_numeric"/>
+  <key width="1.1" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
+  <key width="4.4" key0="space" key7="switch_second" key5="left" key6="right" slider="true"/>
+  <key width="1.1" key0="loc voice_typing" key7="up" key6="right" key5="left" key8="down"/>
+  <key width="1.7" key0="enter" key2="action"/>
 </row>
--- a/res/xml/local_ru_jcuken.xml
+++ b/res/xml/local_ru_jcuken.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="ЙЦУКЕН (Русский)" script="cyrillic">
  <row>
    <key key0="й" key2="1" key4="esc"/>
-    <key key0="ц" key2="2" key3="\@" key4="~"/>
-    <key key0="у" key2="3" key3="\#" key4="!"/>
+    <key key0="ц" key1="loc ї" key2="2" key3="\@" key4="~"/>
+    <key key0="у" key1="loc ў" key2="3" key3="\#" key4="!"/>
    <key key0="к" key2="4" key3="$"/>
    <key key0="е" key1="ё" key2="5" key3="%"/>
-    <key key0="н" key2="6" key3="^"/>
-    <key key0="г" key2="7" key3="&amp;"/>
+    <key key0="н" key1="loc є" key2="6" key3="^"/>
+    <key key0="г" key1="loc ґ" key2="7" key3="&amp;"/>
    <key key0="ш" key2="8" key3="*"/>
    <key key0="щ" key2="9" key3="(" key4=")"/>
-    <key key0="з" key2="0" key3="{" key4="}" />
+    <key key0="з" key2="0" key3="{" key4="}"/>
    <key key0="х" key3="[" key4="]" key1="f11_placeholder" key2="f12_placeholder"/>
-
  </row>
  <row>
    <key key0="ф" key1="tab" key2="`"/>
@@ -33,7 +32,7 @@
    <key width="0.96" key0="ч"/>
    <key width="0.96" key0="с"/>
    <key width="0.96" key0="м"/>
-    <key width="0.96" key0="и" key2="&lt;" key3="."/>
+    <key width="0.96" key0="и" key1="loc і" key2="&lt;" key3="."/>
    <key width="0.96" key0="т" key2="&gt;" key3=","/>
    <key width="0.96" key0="ь" key1="ъ" key2="\?" key3="/"/>
    <key width="0.96" key0="б" key2=":" key3=";"/>
--- a/res/xml/cyrl_jcuken_uk.xml
+++ b/res/xml/cyrl_jcuken_uk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="ЙЦУКЕН (Українська)" script="cyrillic">
  <row>
    <key shift="0.1 " key0="й" key2="1" key4="esc"/>
    <key key0="ц" key1="~" key2="2" key3="\@"/>
--- a/res/xml/cyrl_yaverti.xml
+++ b/res/xml/cyrl_yaverti.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="ЯВЕРТЪ" script="cyrillic">
  <row>
    <key key0="я" key2="1" key4="esc"/>
    <key key0="в" key1="!" key2="2" key3="\@" key4="ч"/>
--- a/res/xml/deva_alt.xml
+++ b/res/xml/deva_alt.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<keyboard name="देवनागरी (हिंदी)-2" script="devanagari">
+  <row>
+    <key shift="0.35" width="0.9" key0="क" key1="ख" key2="घ" key3="ङ"  key4="ग"/>
+    <key              width="0.9" key0="च" key1="छ" key2="झ" key3="ञ"  key4="ज"/>
+    <key              width="0.9" key0="ट" key1="ठ" key2="ढ" key3="ण"  key4="ड"/>
+    <key              width="0.9" key0="त" key1="थ" key2="ध" key3="न"  key4="द"/>
+    <key              width="0.9" key0="प" key1="फ" key2="भ" key3="म"  key4="ब"/>
+    <key              width="0.9" key0="र" key1="ज्ञ" key2="ल" key3="य"  key4="व"/>
+    <key              width="0.9" key0="ह" key1="श" key2="ळ" key3="स"  key4="ष"/>
+  </row>
+  <row>
+    <key shift="0.35" width="0.9" key0="ा" key1="अ" key2="आ"/>
+    <key              width="0.9" key0="ि" key1="इ"/>
+    <key              width="0.9" key0="ी" key1="ई"/>
+    <key              width="0.9" key0="ु" key1="उ" key2="ऊ" key4="ू"/>
+    <key              width="0.9" key0="े" key1="ए" key2="ऋ" key4="ृ"/>
+    <key              width="0.9" key0="ै" key1="ऐ" key2="ऌ" key4="ॢ"/>
+    <key              width="0.9" key0="ो" key1="ओ" key2="औ" key4="ौ"/>
+  </row>
+  <row>
+    <key key0="्" key2="tab" key4="esc"/>
+    <key key0="ँ" key1="₹" key2="॑" key3="ॖ" key4="॓"/>
+    <key key0="ं" key1="ॐ" key2="ऽ" key3="ः" key4="&quot;"/>
+    <key key0="।" key1="," key2=";" key3="!" key4="\?"/>
+    <key key0="़" key1="॰" key2="०" key3="-" key4="॒"/>
+    <key key0="५" key1="१" key2="३" key3="७" key4="९" key5="४" key6="६" key7="२" key8="८"/>
+    <key key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
--- a/res/xml/deva_inscript.xml
+++ b/res/xml/deva_inscript.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="देवनागरी (हिंदी)-1" script="devanagari">
  <row>
    <key key0="ौ" key1="औ" key2="₹" key3="esc" key4="१"/>
    <key key0="ै" key1="ऐ" key2="ऍ" key3="¶" key4="२"/>
--- a/res/xml/greekmath.xml
+++ b/res/xml/greekmath.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard bottom_row="false" extra_keys="false">
+<keyboard bottom_row="false">
  <row>
    <key key0="θ" key2="^"/>
    <key key0="δ" key1="⌊" key2="∨" key3="↔" key4="⊂"/>
@@ -41,7 +41,7 @@
    <key width="1.2" key0="fn"/>
    <key width="2.8" key0="space" key1="superscript" key3="subscript"/>
    <key width="1.2" key0="0" key2="."/>
-    <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
+    <key width="1.2" key7="up" key6="right" key5="left" key8="down"/>
    <key width="1.2" key0="enter" key1="=" key2="action"/>
  </row>
 </keyboard>
--- a/res/xml/grek_qwerty.xml
+++ b/res/xml/grek_qwerty.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="QWERTY (Greek)" script="latin">
  <row>
    <key key0=";" key2="1" key4="esc"/>
    <key key0="ς" key1="~" key2="2" key3="\@"/>
--- a/res/xml/hang_dubeolsik_kr.xml
+++ b/res/xml/hang_dubeolsik_kr.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="두벌식 (Korean)" script="hangul">
  <row>
    <key key0="ㅂ" key2="1" key4="esc"/>
    <key key0="ㅈ" key1="~" key2="2" key3="\@"/>
--- a/res/xml/hebr_1_il.xml
+++ b/res/xml/hebr_1_il.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Based on standard SI-1452-1 -->
+<keyboard name="Hebrew 1" script="hebrew">
+  <row>
+    <key key0="/" key2="1" key3="!" key4="esc"/>
+    <key key0="'" key2="2" key3="\@" key1=";"/>
+    <key key0="ק" key2="3" key3="\#" key1="€"/>
+    <key key0="ר" key2="4" key3="$" key1="₪"/>
+    <key key0="א" key2="5" key3="%"/>
+    <key key0="ט" key2="6" key3="^" key4="ole_placeholder"/>
+    <key key0="ו" key2="7" key3="&amp;" key4="meteg_placeholder"/>
+    <key key0="ן" key2="8" key3="*"/>
+    <key key0="ם" key2="9" key3="b(" key4="lrm"/>
+    <key key0="פ" key2="0" key3="b)" key4="rlm"/>
+    <key key0="backspace" key2="delete" key3="f11_placeholder" key4="f12_placeholder"/>
+  </row>
+  <row>
+    <key key0="ש" key2="`" key1="tab" key3="sindot_placeholder" key4="shindot_placeholder" width="1.333"/>
+    <key key0="ד" key1="~" width="1.0333"/>
+    <key key0="ג" key1="geresh" key2="gershayim" width="1.0333"/>
+    <key key0="כ" width="1.0333"/>
+    <key key0="ע" width="1.0333"/>
+    <key key0="י" key2="-" key3="_" key4="maqaf" width="1.0333"/>
+    <key key0="ח" key2="=" key3="+" width="1.0333"/>
+    <key key0="ל" key2="b[" key3="b{" width="1.0333"/>
+    <key key0="ך" key2="b]" key3="b}" width="1.0333"/>
+    <key key0="ף" key2="," key3="&quot;" key1=":" width="1.4006"/>
+  </row>
+  <row>
+    <key key0="\\" key1="|" key2="shift" key3="loc capslock"/>
+    <key key0="ז"/>
+    <key key0="ס"/>
+    <key key0="ב"/>
+    <key key0="ה"/>
+    <key key0="נ"/>
+    <key key0="מ"/>
+    <key key0="צ"/>
+    <key key0="ת" key1="blt"/>
+    <key key0="ץ" key1="bgt"/>
+    <key key0="." key1="\?"/>
+  </row>
+</keyboard>
--- a/res/xml/hebr_2_il.xml
+++ b/res/xml/hebr_2_il.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Based on standard SI-1452-2 -->
+<keyboard name="Hebrew 2" script="hebrew">
+  <row>
+    <key key0="ץ" key2="1" key3="!" key4="esc"/>
+    <key key0="ן" key2="2" key3="\@" key1=";"/>
+    <key key0="ק" key2="3" key3="\#" key1="€"/>
+    <key key0="ר" key2="4" key3="$" key1="₪"/>
+    <key key0="א" key2="5" key3="%"/>
+    <key key0="ט" key2="6" key3="^" key4="ole_placeholder"/>
+    <key key0="ו" key2="7" key3="&amp;" key4="meteg_placeholder"/>
+    <key key0="ת" key2="8" key3="*"/>
+    <key key0="ם" key2="9" key3="b(" key4="lrm"/>
+    <key key0="פ" key2="0" key3="b)" key4="rlm" width="1.333"/>
+  </row>
+  <row>
+    <key key0="ש" key2="`" key1="tab" key3="sindot_placeholder" key4="shindot_placeholder" width="1.333"/>
+    <key key0="ד" key1="~"/>
+    <key key0="ג" key1="geresh" key2="gershayim"/>
+    <key key0="כ"/>
+    <key key0="ע"/>
+    <key key0="י" key2="-" key3="_" key4="maqaf"/>
+    <key key0="ח" key2="=" key3="+"/>
+    <key key0="ל" key2="b[" key3="b{"/>
+    <key key0="ך" key2="b]" key3="b}"/>
+    <key key0="ף" key2="'" key3="&quot;" key1=":"/>
+  </row>
+  <row>
+    <key key0="\\" key1="|" key2="shift" key3="loc capslock"/>
+    <key key0="ז"/>
+    <key key0="ס"/>
+    <key key0="ב"/>
+    <key key0="ה" />
+    <key key0="נ"/>
+    <key key0="מ" key1="blt" key2=","/>
+    <key key0="צ" key1="bgt" key2="."/>
+    <key key0="/" key1="\?"/>
+    <key key0="backspace" key2="delete" key3="f11_placeholder" key4="f12_placeholder" width="1.333"/>
+  </row>
+</keyboard>
--- a/res/xml/latn_azerty_fr.xml
+++ b/res/xml/latn_azerty_fr.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<!-- Adapted from standard NF Z71-300 -->
+<!-- https://norme-azerty.fr/ -->
+<keyboard name="AZERTY (Français)" script="latin">
  <row>
    <key key0="a" key2="1" key4="esc"/>
    <key key0="z" key2="2" key3="&amp;" key4="~"/>
--- a/res/xml/latn_bone.xml
+++ b/res/xml/latn_bone.xml
@@ -1,5 +1,6 @@
 <?xml	version="1.0"	encoding="utf-8"?>
-<keyboard bottom_row="false">
+<!-- https://neo-layout.org/Layouts/bone/ -->
+<keyboard name="Bone" bottom_row="false" script="latin">
 	<row>
 		<key key0="j"				key2="esc"				key4="…"/>
 		<key key0="d"				key2="°"				key4="_"/>
@@ -38,8 +39,8 @@
 	<row height="0.95">
 		<key width="1.8" key0="ctrl"						key2="loc meta" 								key4="switch_numeric"/>
 		<key width="1.2" key0="fn"		key1="loc alt"			key2="change_method"	key3="switch_emoji" key4="config"/>
-		<key width="4.0" key0="space"	key1="switch_second"					key2="0" 			edgekeys="true"/>
-		<key width="1.2" 				key1="up"			key2="right" 			key3="left" 		key4="down" edgekeys="true"/>
+		<key width="4.0" key0="space"	key7="switch_second"					key8="0"/>
+		<key width="1.2" key7="up" key6="right" key5="left" key8="down"/>
 		<key width="1.8" key0="enter"												key3="action"/>
 	</row>
 </keyboard>
--- a/res/xml/latn_colemak.xml
+++ b/res/xml/latn_colemak.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<!-- https://colemak.com/ -->
+<keyboard name="Colemak" script="latin">
  <row>
    <key key0="q" key1="esc"                key2="loc accent_aigu"    key3="loc accent_tilde"   shift="0.5"/>
    <key key0="w" key1="loc accent_grave"       key2=" ́"              key3="~"            />
--- a/res/xml/latn_dvorak.xml
+++ b/res/xml/latn_dvorak.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="Dvorak" script="latin">
  <row>
    <key key0="shift" width="1.5" key2="esc" key4="tab"/>
    <key key0="p" key1="loc accent_ring" key2="." key3="&lt;" key4="f11_placeholder"/>
@@ -12,10 +12,10 @@
    <key key0="backspace" key2="delete" width="1.5"/>
  </row>
  <row>
-    <key key0="a" key2="1" key4="!"/>
+    <key key0="a" key2="1" key3="loc å" key4="!"/>
    <key key0="o" key1="loc accent_macron" key2="2" key3="\@" key4="loc accent_ogonek"/>
    <key key0="e" key1="loc accent_caron" key2="3" key3="\#" key4="loc accent_dot_above"/>
-    <key key0="u" key2="4" key3="$" key4="loc accent_double_aigu"/>
+    <key key0="u" key1="loc æ" key2="4" key3="$" key4="loc accent_double_aigu"/>
    <key key0="i" key2="5" key3="%"/>
    <key key0="d" key2="6" key3="^"/>
    <key key0="h" key2="7" key3="&amp;"/>
@@ -26,7 +26,7 @@
  <row>
    <key key0="q" shift="0.5" key1="loc accent_tilde" key2="`" key3="~"/>
    <key key0="j" key1="loc accent_aigu" key2="'" key3="&quot;"/>
-    <key key0="k" key2=";" key3=":"/>
+    <key key0="k" key1="loc ø" key2=";" key3=":"/>
    <key key0="x" key1="loc accent_cedille"/>
    <key key0="b"/>
    <key key0="m" key2="/" key3="\?"/>
--- a/res/xml/latn_neo2.xml
+++ b/res/xml/latn_neo2.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard bottom_row="false">
+<!-- https://neo-layout.org/Layouts/neo/ -->
+<keyboard name="Neo 2" bottom_row="false" script="latin">
  <row>
    <key key0="x" key1="°" key2="1" key4="…"/>
    <key key0="v" key1="§" key2="2" key4="_"/>
@@ -41,8 +42,8 @@
  <row height="0.95">
 	  <key width="1.8" key0="ctrl" key2="loc meta" key4="switch_numeric"/>
 	  <key width="1.2" key0="fn" key1="loc alt" key2="change_method" key3="switch_emoji" key4="config"/>
-	  <key width="4.0" key0="space" key1="switch_second" edgekeys="true"/>
-	  <key width="1.2" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
+	  <key width="4.0" key0="space" key7="switch_second"/>
+	  <key width="1.2" key7="up" key6="right" key5="left" key8="down"/>
 	  <key key0="j" key4=";"/>
 	  <key width="1.8" key0="enter" key2="action"/>
 	</row>
--- a/res/xml/latn_qwerty_br.xml
+++ b/res/xml/latn_qwerty_br.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<!-- Adapted from standard ABNT NBR 10346 -->
+<keyboard name="QWERTY (Brasileiro)" script="latin">
  <row>
    <key key0="q" key2="1" key4="esc"/>
    <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
--- a/res/xml/latn_qwerty_es.xml
+++ b/res/xml/latn_qwerty_es.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="QWERTY (Español)" script="latin">
  <row>
    <key key0="q" key2="1" key4="esc"/>
    <key key0="w" key1="~" key2="2" key3="\@"/>
--- a/res/xml/latn_qwerty_hu.xml
+++ b/res/xml/latn_qwerty_hu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="QWERTY (Magyar)" script="latin">
  <row>
    <key key0="q" key2="0" key4="esc"/>
    <key key0="w" key1="'" key2="1" key3="~" key4="|"/>
--- a/res/xml/latn_qwerty_lv.xml
+++ b/res/xml/latn_qwerty_lv.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="QWERTY (Latvian)" script="latin">
  <row>
    <key key0="q" key2="1" key4="esc"/>
    <key key0="w" key1="~" key2="2" key3="\@" key4="!"/>
--- a/res/xml/latn_qwerty_no.xml
+++ b/res/xml/latn_qwerty_no.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="QWERTY (Norwegian)" script="latin">
  <row>
    <key key0="q" key2="1" key4="esc"/>
    <key key0="w" key1="~" key2="2" key3="\@"/>
--- a/res/xml/latn_qwerty_pl.xml
+++ b/res/xml/latn_qwerty_pl.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="QWERTY (Polski)" script="latin">
  <row>
    <key key0="q" key2="1" key4="esc"/>
    <key key0="w" key1="~" key2="2" key3="\@"/>
--- a/res/xml/latn_qwerty_ro.xml
+++ b/res/xml/latn_qwerty_ro.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="QWERTY (Română)" script="latin">
  <row>
    <key key0="q" key2="1" key4="esc"/>
    <key key0="w" key1="~" key2="2" key3="\@"/>
    <key key0="e" key1="!" key2="3" key3="\#" key4="loc €"/>
-    <key key0="r" key2="4" key3="$"/>
-    <key key0="t" key2="5" key3="%"/>
+    <key key0="r" key2="4" key3="$" key1="loc ₪"/>
+    <key key0="t" key1="ț" key2="5" key3="%"/>
    <key key0="y" key2="6" key3="^"/>
    <key key0="u" key2="7" key3="&amp;"/>
-    <key key0="i" key2="8" key3="*"/>
+    <key key0="i" key1="î" key2="8" key3="*"/>
    <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/>
    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
  </row>
  <row>
-    <key shift="0.5" key0="a" key1="tab" key2="`"/>
-    <key key0="s" key1="loc accent_ring" key3="loc ß" key4="loc accent_ogonek"/>
+    <key shift="0.5" key0="a" key1="â" key2="ă" key3="`" key4="tab"/>
+    <key key0="s" key1="ș" key3="loc ß" key4="loc accent_ogonek"/>
    <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
    <key key0="f" key1="loc accent_dot_above"/>
    <key key0="g" key1="loc accent_caron" key2="-" key3="_"/>
--- a/res/xml/latn_qwerty_se.xml
+++ b/res/xml/latn_qwerty_se.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="QWERTY (Swedish)" script="latin">
  <row>
    <key key0="q" key4="esc" key2="1"/>
    <key key0="w" key2="2" key3="`" key4="\@"/>
--- a/res/xml/latn_qwerty_tr.xml
+++ b/res/xml/latn_qwerty_tr.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="QWERTY (Türkçe)" script="latin">
  <row>
    <key key0="q" key2="1" key4="esc"/>
    <key key0="w" key1="~" key2="2" key3="\@"/>
--- a/res/xml/latn_qwerty_us.xml
+++ b/res/xml/latn_qwerty_us.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- This file defines the QWERTY layout.
+
+A layout is made of keys arranged into rows. Keys can be made bigger with the
+'width' attribute and blank space can be added on the left of a key with the
+'shift' attribute.
+
+'key0' assigns the symbol on the middle of the key. 'key1', 'key2', etc..
+assign symbols to the corners of a key, they are arranged like this:
+
+  1 7 2
+  5 0 6
+  3 8 4
+
+Keys prefixed with 'loc ' are not visible on the keyboard. They are used to
+specify a place for a key, if it needed to be added to the layout later.
+(for example, by the "Add keys to keyboard" option)
+
+See bottom_row.xml for the definition of the bottom row and neo2.xml for a
+layout that re-defines it.
+See srcs/juloo.keyboard2/KeyValue.java for the keys that have a special meaning.
+-->
+<keyboard name="QWERTY (US)" script="latin">
+  <row>
+    <key key0="q" key2="1" key4="esc"/>
+    <key key0="w" key1="~" key2="2" key3="\@"/>
+    <key key0="e" key1="!" key2="3" key3="\#" key4="loc €"/>
+    <key key0="r" key2="4" key3="$" key1="loc ₪"/>
+    <key key0="t" key2="5" key3="%"/>
+    <key key0="y" key2="6" key3="^"/>
+    <key key0="u" key2="7" key3="&amp;"/>
+    <key key0="i" key2="8" key3="*"/>
+    <key key0="o" key1="loc accent_macron" key2="9" key3="(" key4=")"/>
+    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="a" key1="tab" key2="`"/>
+    <key key0="s" key1="loc accent_ring" key3="loc ß" key4="loc accent_ogonek"/>
+    <key key0="d" key1="loc accent_grave" key2="loc £" key3="loc accent_aigu"/>
+    <key key0="f" key1="loc accent_dot_above"/>
+    <key key0="g" key1="loc accent_caron" key2="-" key3="_"/>
+    <key key0="h" key2="=" key3="+"/>
+    <key key0="j" key1="loc accent_trema" key2="loc accent_circonflexe" key4="}" key3="{"/>
+    <key key0="k" key1="loc accent_double_aigu" key3="[" key4="]"/>
+    <key key0="l" key2="|" key3="\\"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift" key2="loc capslock"/>
+    <key key0="z"/>
+    <key key0="x"/>
+    <key key0="c" key1="loc accent_cedille" key2="&lt;" key3="."/>
+    <key key0="v" key2="&gt;" key3=","/>
+    <key key0="b" key2="\?" key3="/"/>
+    <key key0="n" key1="loc accent_tilde" key2=":" key3=";"/>
+    <key key0="m" key2="&quot;" key3="'"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
--- a/res/xml/latn_qwerty_vi.xml
+++ b/res/xml/latn_qwerty_vi.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Adapted from standard TCVN 6064-->
+<keyboard name="QWERTY (Vietnamese)" script="latin">
+  <row>
+    <key key0="q" key1="~" key2="1" key3="`" key4="esc"/>
+    <key key0="w" key1="accent_horn" key2="2" key3="\@"/>
+    <key key0="e" key1="!" key2="3" key3="\#" key4="ê"/>
+    <key key0="r" key2="4" key3="$" key1="accent_hook_above"/>
+    <key key0="t" key2="5" key3="%"/>
+    <key key0="y" key2="6" key3="^"/>
+    <key key0="u" key2="7" key3="&amp;"/>
+    <key key0="i" key2="8" key3="*"/>
+    <key key0="o" key1="ô" key2="9" key3="(" key4=")"/>
+    <key key0="p" key2="0" key3="f11_placeholder" key4="f12_placeholder"/>
+  </row>
+  <row>
+    <key shift="0.5" key0="a" key1="tab" key2="ă" key3="â"/>
+    <key key0="s" key1="accent_aigu"/>
+    <key key0="d" key1="accent_bar" key2="₫" key3="đ"/>
+    <key key0="f" key1="accent_grave"/>
+    <key key0="g" key2="-" key3="_"/>
+    <key key0="h" key2="=" key3="+"/>
+    <key key0="j" key1="accent_dot_below" key3="{" key4="}"/>
+    <key key0="k" key3="[" key4="]"/>
+    <key key0="l" key2="|" key3="\"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift" key2="loc capslock"/>
+    <key key0="z"/>
+    <key key0="x" key1="accent_tilde"/>
+    <key key0="c" key2="&lt;" key3="."/>
+    <key key0="v" key2="&gt;" key3=","/>
+    <key key0="b" key2="\?" key3="/"/>
+    <key key0="n" key2=":" key3=";"/>
+    <key key0="m" key2="&quot;" key3="'"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
--- a/res/xml/latn_qwertz.xml
+++ b/res/xml/latn_qwertz.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?> 
-<keyboard>
+<keyboard name="QWERTZ" script="latin">
  <row>
    <key key0="q" key2="1" key4="esc"/>
    <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
--- a/res/xml/latn_qwertz_cz.xml
+++ b/res/xml/latn_qwertz_cz.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<keyboard script="latin" name="QWERTZ (Czech)">
+  <row>
+    <key key0="q" key1="1" key2="esc" key4="~"/>
+    <key key0="w" key1="2" key2="+" key3="|" key4="\\"/>
+    <key key0="e" key1="3" key2="é" key3="^" key4="ě"/>
+    <key key0="r" key1="4" key4="ř"/>
+    <key key0="t" key1="5" key3="°" key4="ť"/>
+    <key key0="z" key1="6" key4="ž"/>
+    <key key0="u" key1="7" key2="ú" key3="`" key4="ů"/>
+    <key key0="i" key1="8" key2="í" key3="(" key4=")"/>
+    <key key0="o" key1="9" key2="ó" key3="/" key4="%"/>
+    <key key0="p" key1="0" key3="="/>
+  </row>
+  <row>
+    <key shift="0.5" key0="a" key1="tab" key2="á" key3=";"/>
+    <key key0="s" key4="š"/>
+    <key key0="d" key4="ď"/>
+    <key key0="f" key3="["/>
+    <key key0="g" key3="]"/>
+    <key key0="h"/>
+    <key key0="j"/>
+    <key key0="k"/>
+    <key key0="l" key1="&quot;" key2="'" key3="$" key4="!"/>
+  </row>
+  <row>
+    <key width="1.5" key0="shift" key2="loc capslock"/>
+    <key key0="y" key2="ý"/>
+    <key key0="x" key3="\#"/>
+    <key key0="c" key3="&amp;" key4="č"/>
+    <key key0="v" key3="\@"/>
+    <key key0="b" key1="&lt;" key2="&gt;" key3="{" key4="}"/>
+    <key key0="n" key1="\?" key2="." key3="," key4="ň"/>
+    <key key0="m" key1=":" key2="*" key3="-" key4="_"/>
+    <key width="1.5" key0="backspace" key2="delete"/>
+  </row>
+</keyboard>
--- a/res/xml/latn_qwertz_cz_multifunctional.xml
+++ b/res/xml/latn_qwertz_cz_multifunctional.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="QWERTZ Multifunctional (Czech)" script="latin">
  <row>
    <key key0="q" key1="1" key4="esc"/>
    <key key0="w" key1="2" key3="~"/>
--- a/res/xml/latn_qwertz_de.xml
+++ b/res/xml/latn_qwertz_de.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<!-- Adapted from standard DIN 2137-1 -->
+<keyboard name="QWERTZ (Deutsch)" script="latin">
  <row>
    <key key0="q" key2="1" key4="esc"/>
    <key key0="w" key1="^" key2="2" key3="&quot;" key4="\@"/>
--- a/res/xml/latn_qwertz_hu.xml
+++ b/res/xml/latn_qwertz_hu.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="QWERTZ (Magyar)" script="latin">
  <row>
    <key key0="q" key2="0" key4="esc"/>
    <key key0="w" key1="'" key2="1" key3="~" key4="|"/>
--- a/res/xml/latn_qwertz_sk.xml
+++ b/res/xml/latn_qwertz_sk.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard>
+<keyboard name="QWERTZ (Slovak)" script="latin">
  <row>
    <key key0="q" key1="1" key4="esc"/>
    <key key0="w" key1="2"/>
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -1,27 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <input-method xmlns:android="http://schemas.android.com/apk/res/android" android:settingsActivity="juloo.keyboard2.SettingsActivity" android:supportsSwitchingToNextInputMethod="true">
-  <subtype android:label="%s" android:languageTag="bg" android:imeSubtypeLocale="bg_BG" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=bgph1,extra_keys=€"/>
-  <subtype android:label="%s" android:languageTag="bn" android:imeSubtypeLocale="bn_BD" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=৳"/>
-  <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=hindi,extra_keys=₹"/>
-  <subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_de,extra_keys=accent_trema|ß|€"/>
-  <subtype android:label="%s" android:languageTag="en-GB" android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=£|€"/>
-  <subtype android:label="%s" android:languageTag="en-US" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty"/>
-  <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_es,extra_keys=accent_grave|accent_aigu|accent_tilde|accent_trema|€"/>
-  <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=azerty,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
-  <subtype android:label="%s" android:languageTag="hu" android:imeSubtypeLocale="hu_HU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_hu,extra_keys=accent_aigu|accent_trema|accent_ogonek|€"/>
-  <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=accent_grave|accent_aigu|€"/>
-  <subtype android:label="%s" android:languageTag="ko" android:imeSubtypeLocale="ko_KR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_ko"/>
-  <subtype android:label="%s" android:languageTag="lt" android:imeSubtypeLocale="lt_LT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,extra_keys=accent_ogonek|accent_caron|accent_dot_above|accent_macron|€"/>
-  <subtype android:label="%s" android:languageTag="lv" android:imeSubtypeLocale="lv_LV" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_lv,extra_keys=accent_caron|accent_cedille|accent_macron|€"/>
-  <subtype android:label="%s" android:languageTag="nl-BE" android:imeSubtypeLocale="nl_BE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=azerty,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
-  <subtype android:label="%s" android:languageTag="no" android:imeSubtypeLocale="no_NO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_no,extra_keys=accent_aigu|€"/>
-  <subtype android:label="%s" android:languageTag="pl" android:imeSubtypeLocale="pl_PL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_pl"/>
-  <subtype android:label="%s" android:languageTag="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_pt,extra_keys=accent_aigu|accent_cedille|accent_circonflexe|accent_grave|accent_tilde|€"/>
-  <subtype android:label="%s" android:languageTag="ru" android:imeSubtypeLocale="ru_RU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=ru_jcuken"/>
-  <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_sv_se,extra_keys=accent_aigu|accent_trema|accent_ring|€"/>
-  <subtype android:label="%s" android:languageTag="tr" android:imeSubtypeLocale="tr_TR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_tr,extra_keys=accent_cedille|accent_trema|₺|ı|ğ"/>
-  <subtype android:label="%s" android:languageTag="uk" android:imeSubtypeLocale="uk_UA" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=jcuken_ua"/>
-  <subtype android:label="%s" android:languageTag="cs" android:imeSubtypeLocale="cs_CZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_cs,extra_keys=a|accent_cedille|accent_circonflexe"/>
-  <subtype android:label="%s" android:languageTag="el" android:imeSubtypeLocale="el" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty_el,extra_keys=£|€"/>
-  <subtype android:label="%s" android:languageTag="sk" android:imeSubtypeLocale="sk_SK" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwertz_sk,extra_keys=é|ě|ŕ|ř|ť|ž|ü|ú|ů|í|ö|ó|ô|á|ä|ś|š|ď|ĺ|ľ|ý|č|ň"/>
+  <subtype android:label="%s" android:languageTag="ar" android:imeSubtypeLocale="ar" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=arabic,default_layout=arab_ibm"/>
+  <subtype android:label="%s" android:languageTag="be" android:imeSubtypeLocale="be_BY" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=cyrl_jcuken_ru,extra_keys=ґ|є|і|ї|ў"/>
+  <subtype android:label="%s" android:languageTag="bg" android:imeSubtypeLocale="bg_BG" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=cyrl_yaverti,extra_keys=€"/>
+  <subtype android:label="%s" android:languageTag="bn" android:imeSubtypeLocale="bn_BD" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=৳"/>
+  <subtype android:label="%s" android:languageTag="cs" android:imeSubtypeLocale="cs_CZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_cz,extra_keys=a|accent_cedille|accent_circonflexe"/>
+  <subtype android:label="%s" android:languageTag="de" android:imeSubtypeLocale="de_DE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_de,extra_keys=accent_trema|ß|€"/>
+  <subtype android:label="%s" android:languageTag="el" android:imeSubtypeLocale="el" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=grek_qwerty,extra_keys=£|€"/>
+  <subtype android:label="%s" android:languageTag="en-GB" android:imeSubtypeLocale="en_GB" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=£|€"/>
+  <subtype android:label="%s" android:languageTag="en-US" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us"/>
+  <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_es,extra_keys=accent_grave|accent_aigu|accent_tilde|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="he" android:imeSubtypeLocale="he_IL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hebrew,default_layout=hebr_1_il,extra_keys=₪|€"/>
+  <subtype android:label="%s" android:languageTag="hi" android:imeSubtypeLocale="hi_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=deva_inscript,extra_keys=₹"/>
+  <subtype android:label="%s" android:languageTag="hu" android:imeSubtypeLocale="hu_HU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_hu,extra_keys=accent_aigu|accent_trema|accent_ogonek|€"/>
+  <subtype android:label="%s" android:languageTag="is" android:imeSubtypeLocale="is_IS" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=ð|þ|ö|æ|accent_aigu"/>
+  <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=accent_grave|accent_aigu|€|ə"/>
+  <subtype android:label="%s" android:languageTag="ko" android:imeSubtypeLocale="ko_KR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=hangul,default_layout=latn_qwerty_us"/>
+  <subtype android:label="%s" android:languageTag="lt" android:imeSubtypeLocale="lt_LT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_us,extra_keys=accent_ogonek|accent_caron|accent_dot_above|accent_macron|€"/>
+  <subtype android:label="%s" android:languageTag="lv" android:imeSubtypeLocale="lv_LV" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_lv,extra_keys=accent_caron|accent_cedille|accent_macron|€"/>
+  <subtype android:label="%s" android:languageTag="mr" android:imeSubtypeLocale="mr_IN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=deva_inscript,extra_keys=₹"/>
+  <subtype android:label="%s" android:languageTag="ne" android:imeSubtypeLocale="ne_NE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=devanagari,default_layout=deva_inscript,extra_keys=₹"/>
+  <subtype android:label="%s" android:languageTag="nl-BE" android:imeSubtypeLocale="nl_BE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave|accent_aigu|accent_circonflexe|accent_cedille|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="no" android:imeSubtypeLocale="no_NO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_no,extra_keys=€|æ|å|ø"/>
+  <subtype android:label="%s" android:languageTag="pl" android:imeSubtypeLocale="pl_PL" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_pl"/>
+  <subtype android:label="%s" android:languageTag="pt" android:imeSubtypeLocale="pt_BR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_pt,extra_keys=accent_aigu|accent_cedille|accent_circonflexe|accent_grave|accent_tilde|€"/>
+  <subtype android:label="%s" android:languageTag="ro" android:imeSubtypeLocale="ro_RO" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_ro,extra_keys=ă|â|î|ș|ț|€|$"/>
+  <subtype android:label="%s" android:languageTag="ru" android:imeSubtypeLocale="ru_RU" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=cyrl_jcuken_ru"/>
+  <subtype android:label="%s" android:languageTag="sk" android:imeSubtypeLocale="sk_SK" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_sk,extra_keys=é|ě|ŕ|ř|ť|ž|ü|ú|ů|í|ö|ó|ô|á|ä|ś|š|ď|ĺ|ľ|ý|č|ň"/>
+  <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_se,extra_keys=accent_aigu|accent_trema|accent_ring|€"/>
+  <subtype android:label="%s" android:languageTag="tr" android:imeSubtypeLocale="tr_TR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_tr,extra_keys=accent_cedille|accent_trema|₺|ı|ğ"/>
+  <subtype android:label="%s" android:languageTag="uk" android:imeSubtypeLocale="uk_UA" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=cyrillic,default_layout=cyrl_jcuken_uk,extra_keys=ґ|є|і|ї"/>
+  <subtype android:label="%s" android:languageTag="vi" android:imeSubtypeLocale="vi_VN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_vi"/>
 </input-method>
--- a/res/xml/number_row.xml
+++ b/res/xml/number_row.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<row height="0.75">
+    <key key0="1"/>
+    <key key0="2"/>
+    <key key0="3"/>
+    <key key0="4"/>
+    <key key0="5"/>
+    <key key0="6"/>
+    <key key0="7"/>
+    <key key0="8"/>
+    <key key0="9"/>
+    <key key0="0"/>
+</row>
--- a/res/xml/numeric.xml
+++ b/res/xml/numeric.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard bottom_row="false" extra_keys="false" num_pad="false">
+<keyboard bottom_row="false">
  <row>
    <key width="0.75" key0="esc" key2="~" key4="!"/>
    <key width="0.75" key0="(" key2="[" key4="{"/>
@@ -13,7 +13,7 @@
    <key width="0.75" key0="tab" key2="|" key4="\\"/>
    <key width="0.75" key0=")" key2="]" key4="}"/>
    <key key0="4" key1="box" key3="arrows"/>
-    <key key0="5" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
+    <key key0="5" key7="up" key6="right" key5="left" key8="down"/>
    <key key0="6"/>
    <key width="0.75" key0="+" key1="Σ" key2="$"/>
    <key width="0.75" key0="-" key1="^"/>
--- a/res/xml/pin.xml
+++ b/res/xml/pin.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<keyboard width="6.0" bottom_row="false" extra_keys="false" num_pad="false">
+<keyboard width="6.0" bottom_row="false">
  <row>
    <key shift="1.0" key0="1"/>
    <key key0="2" indication="ABC"/>
@@ -21,7 +21,7 @@
  <row>
    <key shift="1.0" key0="*" key1="switch_text" key3="switch_numeric"/>
    <key key0="0" key3="+" key4="space"/>
-    <key key0="\#" key1="up" key2="right" key3="left" key4="down" edgekeys="true"/>
+    <key key0="\#" key7="up" key6="right" key5="left" key8="down"/>
    <key key0="enter" key2="action"/>
  </row>
 </keyboard>
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -5,6 +5,7 @@
    <juloo.keyboard2.LayoutListPreference android:key="second_layout" android:title="@string/pref_second_layout_title" app:defaultString="@string/pref_second_layout_none"/>
    <ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_values"/>
    <ListPreference android:key="show_numpad" android:title="@string/pref_show_numpad_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_show_numpad_entries" android:entryValues="@array/pref_show_numpad_values"/>
+    <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
    <PreferenceScreen android:title="@string/pref_extra_keys_title">
      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="0"/>
      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="1"/>
@@ -39,24 +40,29 @@
      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="30"/>
      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="31"/>
      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="32"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="33"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="34"/>
+      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="35"/>
    </PreferenceScreen>
    <ListPreference android:key="numpad_layout" android:title="@string/pref_numpad_layout" android:summary="%s" android:defaultValue="high_first" android:entries="@array/pref_numpad_layout_entries" android:entryValues="@array/pref_numpad_layout_values"/>
  </PreferenceCategory>
  <PreferenceCategory android:title="@string/pref_category_typing">
-    <CheckBoxPreference android:key="autocapitalisation" android:title="@string/pref_autocapitalisation_title" android:summary="@string/pref_autocapitalisation_summary" android:defaultValue="true"/>
    <ListPreference android:key="swipe_dist" android:title="@string/pref_swipe_dist_title" android:summary="@string/pref_swipe_dist_summary" android:defaultValue="15" android:entries="@array/pref_swipe_dist_entries" android:entryValues="@array/pref_swipe_dist_values"/>
    <juloo.common.IntSlideBarPreference android:key="longpress_timeout" android:title="@string/pref_long_timeout_title" android:summary="%sms" android:defaultValue="600" min="50" max="2000"/>
    <juloo.common.IntSlideBarPreference android:key="longpress_interval" android:title="@string/pref_long_interval_title" android:summary="%sms" android:defaultValue="25" min="5" max="100"/>
-    <CheckBoxPreference android:key="precise_repeat" android:title="@string/pref_precise_repeat_title" android:summary="@string/pref_precise_repeat_summary" android:defaultValue="true"/>
    <CheckBoxPreference android:key="lock_double_tap" android:title="@string/pref_lock_double_tap_title" android:summary="@string/pref_lock_double_tap_summary" android:defaultValue="false"/>
-    <CheckBoxPreference android:key="vibrate_enabled" android:title="@string/pref_vibrate_title" android:summary="@string/pref_vibrate_summary" android:defaultValue="true"/>
+  </PreferenceCategory>
+  <PreferenceCategory android:title="@string/pref_category_behavior">
+    <CheckBoxPreference android:key="autocapitalisation" android:title="@string/pref_autocapitalisation_title" android:summary="@string/pref_autocapitalisation_summary" android:defaultValue="true"/>
+    <CheckBoxPreference android:key="switch_input_immediate" android:title="@string/pref_switch_input_immediate_title" android:summary="@string/pref_switch_input_immediate_summary" android:defaultValue="false"/>
+    <ListPreference android:key="vibration_behavior" android:title="@string/pref_vibrate_title" android:summary="@string/pref_vibrate_summary" android:defaultValue="system" android:entries="@array/pref_vibration_entries" android:entryValues="@array/pref_vibration_values"/>
  </PreferenceCategory>
  <PreferenceCategory android:title="@string/pref_category_style">
    <ListPreference android:key="theme" android:title="@string/pref_theme" android:summary="%s" android:defaultValue="system" android:entries="@array/pref_theme_entries" android:entryValues="@array/pref_theme_values"/>
    <juloo.common.IntSlideBarPreference android:key="label_brightness" android:title="@string/pref_label_brightness" android:summary="%s%%" android:defaultValue="100" min="50" max="100"/>
-    <juloo.common.IntSlideBarPreference android:key="keyboard_opacity" android:title="@string/pref_keyboard_opacity" android:summary="%s%%" android:defaultValue="100" min="30" max="100"/>
-    <juloo.common.IntSlideBarPreference android:key="key_opacity" android:title="@string/pref_key_opacity" android:summary="%s%%" android:defaultValue="100" min="30" max="100"/>
-    <juloo.common.IntSlideBarPreference android:key="key_activated_opacity" android:title="@string/pref_key_activated_opacity" android:summary="%s%%" android:defaultValue="100" min="30" max="100"/>
+    <juloo.common.IntSlideBarPreference android:key="keyboard_opacity" android:title="@string/pref_keyboard_opacity" android:summary="%s%%" android:defaultValue="100" min="0" max="100"/>
+    <juloo.common.IntSlideBarPreference android:key="key_opacity" android:title="@string/pref_key_opacity" android:summary="%s%%" android:defaultValue="100" min="0" max="100"/>
+    <juloo.common.IntSlideBarPreference android:key="key_activated_opacity" android:title="@string/pref_key_activated_opacity" android:summary="%s%%" android:defaultValue="100" min="0" max="100"/>
    <PreferenceScreen android:title="@string/pref_margin_bottom_title">
      <juloo.common.IntSlideBarPreference android:key="margin_bottom_portrait" android:title="@string/pref_portrait" android:summary="%sdp" android:defaultValue="7" min="0" max="100"/>
      <juloo.common.IntSlideBarPreference android:key="margin_bottom_landscape" android:title="@string/pref_landscape" android:summary="%sdp" android:defaultValue="3" min="0" max="100"/>
@@ -69,7 +75,7 @@
      <juloo.common.IntSlideBarPreference android:key="horizontal_margin_portrait" android:title="@string/pref_portrait" android:summary="%sdp" android:defaultValue="3" min="0" max="30"/>
      <juloo.common.IntSlideBarPreference android:key="horizontal_margin_landscape" android:title="@string/pref_landscape" android:summary="%sdp" android:defaultValue="28" min="0" max="200"/>
    </PreferenceScreen>
-    <juloo.common.SlideBarPreference android:key="character_size" android:title="@string/pref_character_size_title" android:summary="@string/pref_character_size_summary" android:defaultValue="1.0" min="0.8" max="1.2"/>
+    <juloo.common.SlideBarPreference android:key="character_size" android:title="@string/pref_character_size_title" android:summary="@string/pref_character_size_summary" android:defaultValue="1.0" min="0.75" max="1.5"/>
    <juloo.common.IntSlideBarPreference android:key="key_vertical_space" android:title="@string/pref_key_vertical_space" android:summary="%sdp" android:defaultValue="2" min="0" max="8"/>
    <juloo.common.IntSlideBarPreference android:key="key_horizontal_space" android:title="@string/pref_key_horizontal_space" android:summary="%sdp" android:defaultValue="2" min="0" max="8"/>
  </PreferenceCategory>
--- a/srcs/juloo.keyboard2/Config.java
+++ b/srcs/juloo.keyboard2/Config.java
@@ -3,11 +3,14 @@ package juloo.keyboard2;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.os.Build;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.KeyEvent;
+import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;

 final class Config
@@ -28,8 +31,10 @@ final class Config
  public boolean show_numpad = false;
  // From the 'numpad_layout' option, also apply to the numeric pane.
  public boolean inverse_numpad = false;
+  public boolean number_row;
  public float swipe_dist_px;
-  public boolean vibrateEnabled;
+  public float slide_step_px;
+  public VibratorCompat.VibrationBehavior vibration_behavior;
  public long longPressTimeout;
  public long longPressInterval;
  public float margin_bottom;
@@ -41,20 +46,21 @@ final class Config
  public int keyboardOpacity; // 0 - 255
  public int keyOpacity; // 0 - 255
  public int keyActivatedOpacity; // 0 - 255
-  public boolean preciseRepeat;
  public boolean double_tap_lock_shift;
  public float characterSize; // Ratio
  public int accents; // Values are R.values.pref_accents_v_*
  public int theme; // Values are R.style.*
  public boolean autocapitalisation;
+  public boolean switch_input_immediate;

  // Dynamically set
  public boolean shouldOfferSwitchingToNextInputMethod;
  public boolean shouldOfferSwitchingToSecond;
+  public boolean shouldOfferVoiceTyping;
  public String actionLabel; // Might be 'null'
  public int actionId; // Meaningful only when 'actionLabel' isn't 'null'
  public boolean swapEnterActionKey; // Swap the "enter" and "action" keys
-  public Set<KeyValue> extra_keys_subtype;
+  public ExtraKeys extra_keys_subtype;
  public Set<KeyValue> extra_keys_param;

  public final IKeyEventHandler handler;
@@ -73,6 +79,7 @@ final class Config
    // initialized later
    shouldOfferSwitchingToNextInputMethod = false;
    shouldOfferSwitchingToSecond = false;
+    shouldOfferVoiceTyping = false;
    actionLabel = null;
    actionId = 0;
    swapEnterActionKey = false;
@@ -111,6 +118,7 @@ final class Config
    second_layout = tweak_secondary_layout(layout_of_string(res, _prefs.getString("second_layout", "none")));
    custom_layout = KeyboardData.load_string(_prefs.getString("custom_layout", ""));
    inverse_numpad = _prefs.getString("numpad_layout", "default").equals("low_first");
+    number_row = _prefs.getBoolean("number_row", false);
    // The baseline for the swipe distance correspond to approximately the
    // width of a key in portrait mode, as most layouts have 10 columns.
    // Multipled by the DPI ratio because most swipes are made in the diagonals.
@@ -119,17 +127,14 @@ final class Config
    float swipe_scaling = Math.min(dm.widthPixels, dm.heightPixels) / 10.f * dpi_ratio;
    float swipe_dist_value = Float.valueOf(_prefs.getString("swipe_dist", "15"));
    swipe_dist_px = swipe_dist_value / 25.f * swipe_scaling;
-    vibrateEnabled = _prefs.getBoolean("vibrate_enabled", true);
+    slide_step_px = swipe_dist_px / 4.f;
+    vibration_behavior =
+      VibratorCompat.VibrationBehavior.of_string(_prefs.getString("vibration_behavior", "system"));
    longPressTimeout = _prefs.getInt("longpress_timeout", 600);
    longPressInterval = _prefs.getInt("longpress_interval", 65);
-    margin_bottom = get_dip_pref(dm, oriented_pref("margin_bottom"),
-        res.getDimension(R.dimen.margin_bottom));
-    keyVerticalInterval = get_dip_pref(dm, "key_vertical_space",
-        res.getDimension(R.dimen.key_vertical_interval));
-    keyHorizontalInterval =
-      get_dip_pref(dm, "key_horizontal_space",
-          res.getDimension(R.dimen.key_horizontal_interval))
-      * horizontalIntervalScale;
+    margin_bottom = get_dip_pref_oriented(dm, "margin_bottom", 7, 3);
+    keyVerticalInterval = get_dip_pref(dm, "key_vertical_space", 2);
+    keyHorizontalInterval = get_dip_pref(dm, "key_horizontal_space", 2) * horizontalIntervalScale;
    // Label brightness is used as the alpha channel
    labelBrightness = _prefs.getInt("label_brightness", 100) * 255 / 100;
    // Keyboard opacity
@@ -140,9 +145,7 @@ final class Config
    // during rendered.
    keyHeight = dm.heightPixels * keyboardHeightPercent / 100 / 4;
    horizontal_margin =
-      get_dip_pref(dm, oriented_pref("horizontal_margin"),
-          res.getDimension(R.dimen.horizontal_margin));
-    preciseRepeat = _prefs.getBoolean("precise_repeat", true);
+      get_dip_pref_oriented(dm, "horizontal_margin", 3, 28);
    double_tap_lock_shift = _prefs.getBoolean("lock_double_tap", false);
    characterSize =
      _prefs.getFloat("character_size", 1.f)
@@ -150,48 +153,38 @@ final class Config
    accents = Integer.valueOf(_prefs.getString("accents", "1"));
    theme = getThemeId(res, _prefs.getString("theme", ""));
    autocapitalisation = _prefs.getBoolean("autocapitalisation", true);
+    switch_input_immediate = _prefs.getBoolean("switch_input_immediate", false);
    extra_keys_param = ExtraKeyCheckBoxPreference.get_extra_keys(_prefs);
  }

+  KeyValue action_key()
+  {
+    // Update the name to avoid caching in KeyModifier
+    return (actionLabel == null) ? null :
+      KeyValue.getKeyByName("action").withSymbol(actionLabel);
+  }
+
  /** Update the layout according to the configuration.
   *  - Remove the switching key if it isn't needed
   *  - Remove "localized" keys from other locales (not in 'extra_keys')
   *  - Replace the action key to show the right label
   *  - Swap the enter and action keys
+   *  - Add the optional numpad and number row
   */
  public KeyboardData modify_layout(KeyboardData kw)
  {
-    // Update the name to avoid caching in KeyModifier
-    final KeyValue action_key = (actionLabel == null) ? null :
-      KeyValue.getKeyByName("action").withSymbol(actionLabel);
+    final KeyValue action_key = action_key();
    // Extra keys are removed from the set as they are encountered during the
    // first iteration then automatically added.
    final Set<KeyValue> extra_keys = new HashSet<KeyValue>();
+    final Set<KeyValue> remove_keys = new HashSet<KeyValue>();
    if (extra_keys_subtype != null)
-      extra_keys.addAll(extra_keys_subtype);
+      extra_keys_subtype.compute(extra_keys, kw.script);
    extra_keys.addAll(extra_keys_param);
-    if (kw.num_pad && show_numpad)
-      kw = kw.addNumPad();
+    boolean number_row = this.number_row && !show_numpad;
+    if (number_row)
+      KeyboardData.number_row.getKeys(remove_keys);
    kw = kw.mapKeys(new KeyboardData.MapKeyValues() {
-      /** Apply to the center value only. Partial match, fallback to [apply]. */
-      public KeyboardData.Corner apply_key0(KeyboardData.Corner corner)
-      {
-        if (corner == null)
-          return null;
-        KeyValue kv = corner.kv;
-        switch (kv.getKind())
-        {
-          case Char:
-            char c = kv.getChar();
-            if (inverse_numpad)
-              c = inverse_numpad_char(c);
-            if (c != kv.getChar())
-              return KeyboardData.Corner.of_kv(kv.withChar(c));
-            break;
-        }
-        return super.apply(corner);
-      }
-
      public KeyValue apply(KeyValue key, boolean localized)
      {
        boolean is_extra_key = extra_keys.contains(key);
@@ -199,18 +192,26 @@ final class Config
          extra_keys.remove(key);
        if (localized && !is_extra_key)
          return null;
+        if (remove_keys.contains(key))
+          return null;
        switch (key.getKind())
        {
          case Event:
            switch (key.getEvent())
            {
              case CHANGE_METHOD:
-                return shouldOfferSwitchingToNextInputMethod ? key : null;
+                if (!shouldOfferSwitchingToNextInputMethod)
+                  return null;
+                if (switch_input_immediate)
+                  return KeyValue.getKeyByName("change_method_prev");
+                return key;
              case ACTION:
                return (swapEnterActionKey && action_key != null) ?
                  KeyValue.getKeyByName("enter") : action_key;
              case SWITCH_SECOND:
                return shouldOfferSwitchingToSecond ? key : null;
+              case SWITCH_VOICE_TYPING:
+                return shouldOfferVoiceTyping ? key : null;
            }
            break;
          case Keyevent:
@@ -232,11 +233,54 @@ final class Config
        return key;
      }
    });
+    if (show_numpad)
+      kw = kw.addNumPad();
+    if (number_row)
+      kw = kw.addNumberRow();
    if (extra_keys.size() > 0)
      kw = kw.addExtraKeys(extra_keys.iterator());
    return kw;
  }

+  /**
+   * Handle the numpad layout.
+   */
+  public KeyboardData modify_numpad(KeyboardData kw)
+  {
+    final KeyValue action_key = action_key();
+    return kw.mapKeys(new KeyboardData.MapKeyValues() {
+      public KeyValue apply(KeyValue key, boolean localized)
+      {
+        switch (key.getKind())
+        {
+          case Event:
+            switch (key.getEvent())
+            {
+              case ACTION:
+                return (swapEnterActionKey && action_key != null) ?
+                  KeyValue.getKeyByName("enter") : action_key;
+            }
+            break;
+          case Keyevent:
+            switch (key.getKeyevent())
+            {
+              case KeyEvent.KEYCODE_ENTER:
+                return (swapEnterActionKey && action_key != null) ? action_key : key;
+            }
+            break;
+          case Char:
+            char a = key.getChar(), b = a;
+            if (inverse_numpad)
+              b = inverse_numpad_char(a);
+            if (a != b)
+              return key.withChar(b);
+            break;
+        }
+        return key;
+      }
+    });
+  }
+
  /** Modify a layout to turn it into a secondary layout by changing the
      "switch_second" key. */
  KeyboardData tweak_secondary_layout(KeyboardData layout)
@@ -264,11 +308,12 @@ final class Config
    return (TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, value, dm));
  }

-  /** Returns preference name from a prefix depending on orientation. */
-  private String oriented_pref(String base_name)
+  /** [get_dip_pref] depending on orientation. */
+  float get_dip_pref_oriented(DisplayMetrics dm, String pref_base_name, float def_port, float def_land)
  {
    String suffix = orientation_landscape ? "_landscape" : "_portrait";
-    return base_name + suffix;
+    float def = orientation_landscape ? def_land : def_port;
+    return get_dip_pref(dm, pref_base_name + suffix, def);
  }

  private int getThemeId(Resources res, String theme_name)
@@ -277,8 +322,10 @@ final class Config
    {
      case "light": return R.style.Light;
      case "black": return R.style.Black;
+      case "altblack": return R.style.AltBlack;
      case "dark": return R.style.Dark;
      case "white": return R.style.White;
+      case "epaper": return R.style.ePaper;
      default:
      case "system":
        if (Build.VERSION.SDK_INT >= 8)
@@ -291,41 +338,34 @@ final class Config
    }
  }

+  /** Obtained from XML. */
+  static List<String> layout_ids_str = null;
+  static TypedArray layout_ids_res = null;
+
+  /** Might return [null] if the selected layout is "system", "custom" or if
+      the name is not recognized. */
  public KeyboardData layout_of_string(Resources res, String name)
  {
-    int id = R.xml.qwerty; // The config might store an invalid layout, don't crash
+    if (layout_ids_str == null)
+    {
+      layout_ids_str = Arrays.asList(res.getStringArray(R.array.pref_layout_values));
+      layout_ids_res = res.obtainTypedArray(R.array.layout_ids);
+    }
+    int i = layout_ids_str.indexOf(name);
+    if (i >= 0)
+    {
+      int id = layout_ids_res.getResourceId(i, 0);
+      if (id > 0)
+        return KeyboardData.load(res, id);
+      // Fallthrough
+    }
    switch (name)
    {
-      case "system": case "none": return null;
-      case "custom": if (custom_layout != null) return custom_layout; break;
-      case "azerty": id = R.xml.azerty; break;
-      case "bangla": id = R.xml.bangla; break;
-      case "bgph1": id = R.xml.local_bgph1; break;
-      case "bone": id = R.xml.bone; break;
-      case "colemak": id = R.xml.colemak; break;
-      case "dvorak": id = R.xml.dvorak; break;
-      case "hindi": id = R.xml.hindi; break;
-      case "jcuken_ua": id = R.xml.jcuken_ua; break;
-      case "neo2": id = R.xml.neo2; break;
-      case "qwerty": id = R.xml.qwerty; break;
-      case "qwerty_el": id = R.xml.qwerty_el; break;
-      case "qwerty_es": id = R.xml.qwerty_es; break;
-      case "qwerty_hu": id = R.xml.qwerty_hu; break;
-      case "qwerty_ko": id = R.xml.qwerty_ko; break;
-      case "qwerty_lv": id = R.xml.qwerty_lv; break;
-      case "qwerty_no": id = R.xml.qwerty_no; break;
-      case "qwerty_pt": id = R.xml.qwerty_pt; break;
-      case "qwerty_sv_se": id = R.xml.qwerty_sv_se; break;
-      case "qwerty_tr": id = R.xml.qwerty_tr; break;
-      case "qwerty_pl": id = R.xml.qwerty_pl; break;
-      case "qwertz": id = R.xml.qwertz; break;
-      case "qwertz_cs": id = R.xml.qwertz_cs; break;
-      case "qwertz_de": id = R.xml.qwertz_de; break;
-      case "qwertz_hu": id = R.xml.qwertz_hu; break;
-      case "qwertz_sk": id = R.xml.qwertz_sk; break;
-      case "ru_jcuken": id = R.xml.local_ru_jcuken; break;
+      case "custom": return custom_layout;
+      case "system":
+      case "none":
+      default: return null;
    }
-    return KeyboardData.load(res, id);
  }

  char inverse_numpad_char(char c)
--- a/srcs/juloo.keyboard2/ExtraKeyCheckBoxPreference.java
+++ b/srcs/juloo.keyboard2/ExtraKeyCheckBoxPreference.java
@@ -16,6 +16,7 @@ public class ExtraKeyCheckBoxPreference extends CheckBoxPreference
  {
    "alt",
    "meta",
+    "voice_typing",
    "accent_aigu",
    "accent_grave",
    "accent_double_aigu",
@@ -31,6 +32,9 @@ public class ExtraKeyCheckBoxPreference extends CheckBoxPreference
    "accent_breve",
    "accent_slash",
    "accent_bar",
+    "accent_dot_below",
+    "accent_hook_above",
+    "accent_horn",
    "€",
    "ß",
    "£",
@@ -53,6 +57,8 @@ public class ExtraKeyCheckBoxPreference extends CheckBoxPreference
  {
    switch (name)
    {
+      case "voice_typing":
+        return true;
      default:
        return false;
    }
--- a/srcs/juloo.keyboard2/ExtraKeys.java
+++ b/srcs/juloo.keyboard2/ExtraKeys.java
@@ -0,0 +1,57 @@
+package juloo.keyboard2;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+class ExtraKeys
+{
+  Map<String, List<KeyValue>> _keys_per_script;
+
+  public ExtraKeys()
+  {
+    _keys_per_script = new HashMap<String, List<KeyValue>>();
+  }
+
+  public void add_keys_for_script(String script, List<KeyValue> kvs)
+  {
+    List<KeyValue> ks = _keys_per_script.get(script);
+    if (ks == null) ks = new ArrayList<KeyValue>();
+    ks.addAll(kvs);
+    _keys_per_script.put(script, ks);
+  }
+
+  /** Add the keys that should be added to the keyboard into [dst]. [null] is
+      a valid script. */
+  public void compute(Set<KeyValue> dst, String script)
+  {
+    if (script == null)
+    {
+      for (String sc : _keys_per_script.keySet())
+        get_keys_of_script(dst, sc);
+    }
+    else
+    {
+      get_keys_of_script(dst, null);
+      get_keys_of_script(dst, script);
+    }
+  }
+
+  void get_keys_of_script(Set<KeyValue> dst, String script)
+  {
+    List<KeyValue> ks = _keys_per_script.get(script);
+    if (ks != null)
+      dst.addAll(ks);
+  }
+
+  public static List<KeyValue> parse_extra_keys(String str)
+  {
+    List<KeyValue> dst = new ArrayList<KeyValue>();
+    String[] ks = str.split("\\|");
+    for (int i = 0; i < ks.length; i++)
+      dst.add(KeyValue.getKeyByName(ks[i]));
+    return dst;
+  }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jules Aguillon	82f347043a	Release 1.23.0 (35)	2023-07-01 17:27:08 +02:00
frimdo	d79f87420f	New default Czech layout (#380 ) The previous default layout is renamed `latn_qwertz_cz_multifunctional`.	2023-07-01 17:04:31 +02:00
Jules Aguillon	bd39137c28	Add extra keys to Norwegian The added keys are also placed on the Dvorak layout.	2023-07-01 16:38:36 +02:00
Jules Aguillon	e025fddf2f	Accept some escaped keys in custom layouts These symbols have special meaning when in `res/xml` and are escaped in standard layouts. The backslash is not stripped when parsed from the custom layout option. Treat these backslashed keys specifically to allow standard layouts to be passed back to the custom layout option.	2023-06-28 18:04:32 +02:00
Jules Aguillon	434f9aaf2d	Fix crash when the layout has less than 3 rows	2023-06-28 17:50:32 +02:00
Jules Aguillon	c0833de37c	Add hardcoded charmaps for most accents `KeyCharacterMap.getDeadChar` may not be aware of the same dead keys in older version of Android. Hardcoded charmaps are more predictable.	2023-06-25 20:00:29 +02:00
Jules Aguillon	c1b7503239	CI: Check that 'gen_layouts.py' output is uptodate	2023-06-25 16:52:48 +02:00
Jules Aguillon	de6c3b024d	Update guidelines about adding layouts to reflect the recent changes. Also, change `gen_layouts.py` to not generate warnings for file that are known not to be layouts.	2023-06-25 16:48:18 +02:00
Jules Aguillon	15c608b8cd	Use generated arrays in Config.layout_of_string This function is no longer an hardcoded list of layout ids. It's replaced by a linear scan of the previously generated array and a new corresponding array of resource ids.	2023-06-25 16:34:05 +02:00
Jules Aguillon	8ba82d2555	Generate layouts arrays used in settings `gen_layouts.py` lists the layouts in `res/xml` and generate the `pref_layout_values` and `pref_layout_entries` arrays into `res/values/layouts.xml`. These arrays are hard to maintain as the order has to match, which is fragile. This relies on every layouts having a `name` attribute.	2023-06-25 15:52:24 +02:00
Jules Aguillon	f36864533c	Standard layout names (#386 ) The names are comprised of: script, layout name, country code. Co-authored-by: grim <verdastelo9604@hotmail.com>	2023-06-25 13:40:20 +02:00
Vasile Chelban	5cfbc6ed5b	Added Romanian layout and translations with special romanian characters (#358 ) Added Romanian characters to the keyboard layout and changed the positioning corner for the secondary characters that were conflicting with the newly-introduced romanian characters Added Romanian translations	2023-06-25 12:19:00 +02:00
Jules Aguillon	49fbfa71eb	Update check_layout.output	2023-06-25 12:13:46 +02:00
Sabbir	8160b1ac05	Add Bengali Provat Layout (#357 ) * Add Bengali Provat Layout I added bengali_provat layout and renamed old bengali to actual layout name.	2023-06-25 12:12:46 +02:00
Jules Aguillon	f1a8e7c04c	Specify the script of every layouts and locales This new information will avoid showing é on a cyrillic layout and ґ on a latin layout.	2023-06-24 23:46:14 +02:00
Jules Aguillon	9bcfec8bd1	Per-script extra keys Allows to define a locale's script in 'method.xml' and use that to add the extra keys for a locale to layouts of the same script only. A locale of an undefined script will add its extra keys to every layouts. A layout of an undefined script will have the extra keys of all the enabled locales.	2023-06-24 23:29:24 +02:00
Jules Aguillon	5fc68373d3	Allow to specify a layout script Add the `script` attribute, which will be used to implement script-specific extra keys.	2023-06-22 20:14:20 +02:00
Jules Aguillon	9f90b807f8	Add ə to the extra keys for Italian	2023-06-22 19:24:25 +02:00
Jules Aguillon	a26a535729	Fix `_localeTextLayout` null on API < 12 On API level < 12 or on some rare cases, `refreshSubtypeLayout` was not called, making `_localeTextLayout` uninitialized. This might also happen if `getExtraValueOf` returns an invalid layout name. eg. `method.xml` contains an invalid layout name.	2023-06-10 18:07:23 +02:00
six-6	b4177b5267	Use utf-8 encoding while formatting translations on Windows. (#376 ) When running sync_translations.py on Windows, an error will show because it use gbk encoding by default. Using utf-8 encoding explicitly can fix it.	2023-06-07 18:14:41 +02:00
six-6	b05dfd10d2	Update translations of Simplified Chinese (#377 )	2023-06-07 18:13:57 +02:00
Jules Aguillon	3400a96c4f	Increase vibration values	2023-06-04 23:33:04 +02:00
KuRa KuRd	53acdf7df7	Add Kurdish Layout (#353 ) Add Kurdish Keyboard Layout Qwerty Based Without Shift.	2023-06-04 23:21:14 +02:00
Jules Aguillon	01bfe73fc7	Explicitly map dead key for ñ `KeyCharacterMap.getDeadChar` seems to not give the expected result on Android 4.0. This might affect many more dead key combinations that are not fixed by this commit.	2023-06-04 23:07:35 +02:00
Chasm Solacer	75e6add091	Updated pl (Polish) translation (#374 )	2023-06-03 21:07:14 +02:00
Jules Aguillon	e5ae4816df	Add automated checks on layouts The script `check_layout.py` checks some properties about layouts. No check is an error. The result of running this script on every layouts is stored in the file `check_layout.output`, which is useful to track changes. Add make rules to run this script as well as `sync_translations`.	2023-06-03 21:03:05 +02:00
Jules Aguillon	f451902efa	Refactor: Remove dimens used as option defaults The conversion into px was done twice, leading to wrong values.	2023-06-03 20:20:09 +02:00
Jules Aguillon	a83a19a0a8	Refactor: Handle Event keys in Keyboard2 The `KeyEventHandler` class is intended to handle every keys and to call into the main class through a limited API. However, this is not true for `Event` keys, which in practice had each a corresponding API call.	2023-06-03 20:06:44 +02:00
Jules Aguillon	bd9e25d298	CONTRIBUTING: Translation updates link	2023-06-03 19:38:42 +02:00
Jules Aguillon	77d09cd9ec	Fix escaping in values-fr/strings.xml	2023-06-03 19:03:45 +02:00
Jules Aguillon	06633841c0	Update fr translations	2023-06-03 18:46:50 +02:00
Jules Aguillon	59b3341eaf	Hide the voice typing key if no suitable IM Implemented similarly to the IM switching key.	2023-06-03 18:35:16 +02:00
Jules Aguillon	85cdb9b2b5	Add Voice Typing key The new key switches to any installed "voice" input method. If several input methods matches, no effort is made to choose. Might misbehave with some input methods other than Google's on API < 28. It is placed on the middle of the arrows on the bottom bar. It is enabled by default and can be removed in the "Extra keys" option. The key is not removed from the keyboard if no voice input method exists.	2023-06-03 18:11:42 +02:00
Jules Aguillon	69e0b4c2a2	More control over vibration The newer haptic feedback API that is used instead of the vibrator service since `ef03dfe` doesn't work for everyone. The new vibration option allow to choose both the newer API ("system") and the older API ("strong", "medium", "light").	2023-06-03 11:15:19 +02:00
Jules Aguillon	6f418727cf	Launcher activity: Don't handle the back button	2023-06-03 10:00:16 +02:00
Jules Aguillon	22d407c46a	Per-layout shift modmap Specify the behavior of shift for a layout. This is intended for locales that use the same alphabet but have different capital letters (eg. Bengali). The modmap is defined like this: <keyboard> <modmap> <shift a="a" b="A"/> </modmap> </keyboard>	2023-06-03 09:37:59 +02:00
Jules Aguillon	d2a92795e9	Mention Lixquid's editor in CONTRIBUTING.md	2023-05-28 22:57:54 +02:00
marciozomb13	e46535dc1c	Update pt-br translation (#367 ) Update pt-br translation	2023-05-28 22:24:37 +02:00
marciozomb13	0dd77b5f7a	Update pt-BR title.txt (#368 ) Updated to Match the translated name	2023-05-28 22:22:39 +02:00
Reza Hosseinzadeh	7558a0f5e3	Modify persian layout and add some new characters (#348 ) - Add character پ and ژ - Change math operators and symbols location	2023-05-24 19:43:30 +02:00
vladgba	62943ba4d3	Fix gravity of keyboard in full screen (#363 ) Set keyboard bottom gravity and adjust inputArea height so it doesn't appear on top in fullscreen.	2023-05-24 19:23:28 +02:00
Jules Aguillon	649aea8c79	Increase the range of the "label size" option	2023-05-12 21:37:43 +02:00
Reza Hosseinzadeh	68104e8856	Complete Farsi translation (#346 )	2023-04-23 18:57:49 +02:00
Reza Hosseinzadeh	e3347a166f	Pull request to add new layout Persian (#342 ) * Add persian layout * Change layoutId_of_string to layout_of_string * Add translation for Persian	2023-04-23 01:47:25 +02:00
rVnPower	145f209189	Translation update for Vietnamese (#344 )	2023-04-21 17:00:56 +02:00
polyctena	cd92086a4d	Update German strings.xml (#337 )	2023-04-19 19:05:34 +02:00
Moini	a8c2f14394	Update German translation for app descriptions (#336 ) * Update short description for German * Update German translation for long description.	2023-04-17 13:01:09 +02:00
Maki Nishikino	6a2e064faa	Updated russian description and strings.xml (#334 )	2023-04-16 17:38:28 +02:00
Edgars	3d27ece0a5	Update translation for description in Latvian (#335 )	2023-04-16 17:37:10 +02:00
Chasm Solacer	41b6d869c2	Updated pl (Polish) translation (#333 )	2023-04-16 14:03:27 +02:00
Jules Aguillon	866b37ca52	Add language: Icelandic	2023-04-15 16:25:45 +02:00
Jules Aguillon	dd51a4c0df	New app description	2023-04-15 16:24:11 +02:00
Jules Aguillon	02f4795d2d	Update contributing guidelines	2023-04-15 16:11:23 +02:00
Jules Aguillon	73737e5148	Release 1.22.1	2023-04-10 13:18:24 +02:00
Jules Aguillon	fc901bae9b	Launcher activity: Fix crash on API < 28	2023-04-10 13:15:59 +02:00
doak	d4be979696	Do not lock modifiers if sliding a key This unconditionally removes all pointers (touches) pressing modifiers which are not already locked, avoiding that the (currently) latched modifier will be locked aventually. This can be verfified while sliding the space bar to move the cursor left or right. Closes #319.	2023-04-10 13:14:50 +02:00
Jules Aguillon	1aaf427883	Release 1.22.0	2023-04-02 17:27:44 +02:00
Jules Aguillon	a662934afc	Bump targetSdkVersion to 33 No change needed.	2023-04-02 17:16:56 +02:00
Jules Aguillon	351355b3a7	Launcher activity: Input box For trying the keyboard without having to mess with an other app.	2023-04-02 13:29:53 +02:00
Jules Aguillon	3caca59ff4	Refactor: Remove unecessary method KeyboardData.load_pin_entry	2023-03-28 11:55:24 +02:00
Jules Aguillon	35b4e442ab	Add a launchable explanatory activity This activity points to the system settings page for enabling input methods. This is purely a shortcut but is expected by many users. It could be made more useful in the future or hidden whenever the keyboard is enabled.	2023-03-28 11:22:17 +02:00
Jules Aguillon	c4de1ec267	sync_translations.py: Output sub-elements	2023-03-28 11:11:41 +02:00
Chasm Solacer	59b0b60f3f	Updated pl (Polish) translation (#316 )	2023-03-24 01:26:14 +01:00
Jules Aguillon	2f938dc6f4	Correct pointer direction The previous algorithm did not cut the circle into 16 equal parts. The division by 2pi yielded numbers smaller than 16, which no longer made sense after the cast to int.	2023-03-13 03:06:43 +01:00
Mostafa Ayesh	ce51df6f5a	Add Arabic layout (#314 ) * add arabic keyboard * use unicode values for special characters * add alternate layout * use arabic numbers	2023-03-11 16:54:20 +01:00
Luke Videckis	6aaa497393	New Hindi layout (#313 ) * New Hindi layout * Update default layout for Marathi, Nepali * Consistent naming for Devanagari layouts	2023-03-11 16:43:17 +01:00
Jules Aguillon	bac228e6fb	Add extra keys for Ukrainian	2023-03-05 23:36:15 +01:00
Jules Aguillon	d7e4840f4d	Add support for Belarusian It uses the russian layout with placed extra keys.	2023-03-05 23:34:26 +01:00
Jules Aguillon	18d3fd3c84	Refactor: Remove KeyboardData.Corner The Corner class is removed. The "localized" flag for all the corners is held in a bitfield.	2023-03-05 23:08:35 +01:00
Jules Aguillon	c56ad425f6	Remove the 'edgekeys' attribute	2023-03-05 20:08:56 +01:00
Jules Aguillon	a6fe5cae00	Allow 8 symbols per key 'Keyboard.Key' now contains an array of size 9, giving each keyvalue an index. The algorithm for finding the nearest key during a swipe now needs 16 segments, which are now calculated as an angle. The algorithm does one more interation instead of 2 more, slightly reducing the sensitivity of corner values. The 'getAtDirection' function is moved into the Pointers class to clearly separate the two systems. The 'edgekey' attribute is now obsolete but is kept for compatibility. The flag is removed internally, key index are simply translated. Similarly, the 'slider' attribute now act on keys at index 5 and 6 instead of 2 and 3.	2023-03-03 19:44:05 +01:00
Jules Aguillon	1f9e92ed60	Fix caps lock stopped by auto-capitalisation Auto-capitalisation triggers when the backspace key is used. Make sure to not remove a locked shift pointer.	2023-03-02 11:40:22 +01:00
Jules Aguillon	0da02d60c4	Do not remove numpad keys from the layout This removes keys like '.' and '-' from their usual place, which is pretty annoying. The feature is retained for the number row.	2023-03-02 10:57:58 +01:00
Edgars	70754aa3eb	Update LV translation	2023-03-02 10:41:46 +01:00
Jules Aguillon	2244c46af1	Allow key and keyboard opacity to be 0	2023-02-26 11:52:10 +01:00
Jules Aguillon	798494e701	Fix miscalculated keyboard height with number row The 'keysHeight' field needs to be updated. As this class is not intended to be mutable, copy the list of rows and call the constructor. Also remove an unecessary component of the keyboard height calculation.	2023-02-26 11:31:08 +01:00
mscheidemann	0d902aa334	Update values-de/strings.xml (#295 ) Missing German translation completed	2023-02-26 09:54:47 +01:00
Jules Aguillon	91f27a1432	Update translations Outdated since `0f62b30`	2023-02-26 09:49:06 +01:00
JackDotJS	9523b158b3	Add theme "Alternative Black" (#297 ) * Add alternative black theme	2023-02-26 09:47:31 +01:00
Jules Aguillon	2ca7b4427d	Release 1.21.0 (32)	2023-02-12 23:38:37 +01:00
Jules Aguillon	0f62b3044c	Option to switch to the previous input method A new option changes the "change_method" into the new "change_method_prev". It switch to the previously used input method. A long press on "change_method_prev" sends "change_method". A new section is added in the settings and existing options are moved.	2023-02-12 23:20:11 +01:00
Jules Aguillon	c46e3b6c61	Modify keys after a long press	2023-02-12 23:14:57 +01:00
Kazoku	5fac3459aa	Added missing accent that can combine with `horn_accent` (#293 )	2023-02-09 23:38:55 +01:00
Kazoku	b54f9c5797	Vietnamese keyboard (#291 ) Added missing accent (horn, hook, dot below) Added layout Added accent font svg (by modified existing accent)	2023-02-09 18:40:48 +01:00
Jules Aguillon	72249b8a42	Fix arrow keys not repeating The special handling of arrow keys have been removed in `854eff2`. Key repeat was not starting when the key0 was empty.	2023-02-08 22:38:01 +01:00
rVnPower	82b2bf6dfb	Complete Vietnamese translation (#292 )	2023-02-08 16:35:44 +01:00
Ram Kromberg	0fe27ef486	Add theme 'ePaper' (#287 ) * Add theme 'ePaper'	2023-01-31 20:11:36 +01:00
Ram Kromberg	51ce2ccdf1	Add layouts 'he_il_1452_1' and 'he_il_1452_2'	2023-01-31 20:07:30 +01:00
Jules Aguillon	eb0df72ba1	Update French translation	2023-01-31 00:07:17 +01:00
Jules Aguillon	540384bb0a	Add optional number row An option is added to enable an extra number row at the top of the keyboard. Digits are removed from the keyboard while the number row is visible.	2023-01-30 23:58:47 +01:00
Jules Aguillon	c7184303e9	Remove the digits when numpad is visible	2023-01-30 23:54:39 +01:00
Jules Aguillon	78a461f740	Modification step for the special layout Refactor, follow up of `90b7944`. Add a modification step to the "special" layouts: numpad, greekmath, pin entry. Remove the apply_key0 function, which is not expressive enough. Add an enum instead of yet an other "switch_" function.	2023-01-30 23:46:02 +01:00
Jules Aguillon	90b7944129	Apply modify_layout to text layout only Refactor. Allows to remove the 'extra_keys' and 'num_pad' flags and to implement more complicated transformations to the layouts.	2023-01-30 22:33:01 +01:00
Jules Aguillon	2539feadcd	Fix placeholder key not replaced Since `fecc4dd`, placeholder keys can't be compared by reference. Add a placeholder kind and defined placeholder values.	2023-01-30 21:29:59 +01:00
Jules Aguillon	5f283cd0cd	Slightly increase the width of the spacebar The left and right arrows are less often needed and the key can be shorter.	2023-01-29 19:46:56 +01:00
Jules Aguillon	fecc4dd70a	Remove the explicit hashmap in KeyValue Refactoring. Predefined keys are represented by a big switch statement rather than added into a hashmap.	2023-01-29 19:38:54 +01:00
Jules Aguillon	7bc93c470e	Don't send event at end of sliding A sliding pointer going up must not cause a key event to be sent. This caused an extra cursor movement and cleared the latched modifiers.	2023-01-29 18:49:44 +01:00
Jules Aguillon	854eff211d	Move cursor by sliding on the space bar Send key events for the left or right arrow as the finger slides on the space bar. Can be used to select text by holding shift. Works under Termux. Events are sent linearly as the finger travels. The distance between each events is defined from the swiping distance divided by 4. 'slider="true"' can be set on a key that have 'edgekeys="true"'. 'key2' and 'key3' represent the right and left keys.	2023-01-22 23:21:21 +01:00
Jules Aguillon	f4032e3be9	Remove the modulated repeat It allowed to modulate the repeat speed of some keys (arrow, backspace, delete) by move the finger farther or closer to the key. In practice, this wasn't pratical and doesn't seem popular. It is removed in favor of a better mechanism for moving the cursor.	2023-01-22 23:20:04 +01:00
Maki Nishikino	f7f4d4d6aa	Update russian strings.xml (#280 )	2023-01-21 15:56:32 +01:00
				`@@ -0,0 +1 @@`
				`Tastatură virtuală pentru Android, ușoară și respectuoasă cu viața privată.`
				`@@ -0,0 +1 @@`
				`Bàn phím ảo gọn nhẹ và tôn trọng quyền riêng tư cho Android.`