Release 1.26.0 (38)

Moving the cursor with setSelection has no effect on Acode, for which
the fallback must be used.

.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

.github/workflows/make-apk.yml

@@ -12,36 +12,37 @@ jobs:
     - uses: actions/setup-java@v3
       with:
         distribution: 'zulu' # See 'Supported distributions' for available options
-        java-version: '11'
+        java-version: '17'
     - name: Checkout repo
       uses: actions/checkout@v3
-    - name: Cache debug certificate
-      uses: actions/cache@v3
-      with:
-        path: _build/debug.keystore
-        key: debug-keystore
-    - name: Restore debug keystore from github Secrets 
+    - name: Restore debug keystore from GitHub Secrets
       run: |
-        mkdir -p _build
-        cd "_build"
         # Check if exist and use the secret named DEBUG_KEYSTORE
         # The contents of the secret can be obtained -
-        #    from the debug.keystore.asc from you local _build folder
+        #    from the debug.keystore.asc from you local folder (refer to CONTRIBUTING.md#Using the local debug.keystore on the Github CI actions)
         if [[ ! "${{ secrets.DEBUG_KEYSTORE }}" = "" ]]; then
             echo "${{ secrets.DEBUG_KEYSTORE }}" > "debug.keystore.asc"
             if [[ -s "debug.keystore.asc" ]]; then
+                echo "Restoring debug keystore from GitHub secrets"
                 gpg -d --passphrase "debug0" --batch "debug.keystore.asc" > "debug.keystore"
             fi
         fi
-    - name: Build
-      run: make
+    - name: Build debug APK
+      uses: gradle/gradle-build-action@v2
+      env:
+        DEBUG_KEYSTORE: "debug.keystore"
+        DEBUG_KEYSTORE_PASSWORD: debug0
+        DEBUG_KEY_ALIAS: debug
+        DEBUG_KEY_PASSWORD: debug0
+      with:
+        arguments: assembleDebug
     - name: Artifact naming
       run: |
         artifact="${{github.repository_owner}} ${{github.ref_name}}"
         artifact="${artifact//\//-}" # replace slashes
         echo "artifact=${artifact}" >> $GITHUB_ENV
-    - name: Save debug apk
+    - name: Upload debug APK
       uses: actions/upload-artifact@v3
       with:
         name: "${{env.artifact}} debug_apk"
-        path: _build/*.apk
+        path: build/outputs/apk/debug/*.apk

.gitignore

@@ -1,4 +1,12 @@
 *.keystore
 *.keystore.asc
-_build
 /*-keystore.conf
+*.iml
+.gradle
+/local.properties
+/.idea
+.DS_Store
+/captures
+/build
+# Directory _build is not used anymore
+/_build

AndroidManifest.xml

@@ -1,19 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="juloo.keyboard2" android:versionCode="29" android:versionName="1.20.0" android:hardwareAccelerated="false">
-  <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="31"/>
-  <application android:label="@string/app_name" android:allowBackup="true" android:icon="@drawable/ic_launcher" android:hardwareAccelerated="false">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:hardwareAccelerated="false">
+  <application android:label="@string/app_name" android:allowBackup="true" android:icon="@mipmap/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>
         <action android:name="android.view.InputMethod"/>
       </intent-filter>
       <meta-data android:name="android.view.im" android:resource="@xml/method"/>
     </service>
-    <activity android:name="juloo.keyboard2.SettingsActivity" android:icon="@drawable/ic_launcher" android:label="@string/settings_activity_label" android:theme="@style/android:Theme.DeviceDefault" android:exported="true" android:directBootAware="true">
+    <activity android:name="juloo.keyboard2.SettingsActivity" android:icon="@mipmap/ic_launcher" android:label="@string/settings_activity_label" android:theme="@style/appTheme" android:exported="true" android:directBootAware="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
       </intent-filter>
     </activity>
+    <activity android:name="juloo.keyboard2.LauncherActivity" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/appTheme" 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"/>
+
+  <!-- To query enabled input methods for voice IME detection -->
+  <queries>
+    <intent>
+      <action android:name="android.view.InputMethod" />
+    </intent>
+  </queries>
 </manifest>

CONTRIBUTING.md

@@ -4,67 +4,60 @@ Thanks for contributing :)
 
 ## Building the app
 
-The application doesn't use Gradle and it might be hard to use some features of
-Android Studio.
-
-Fortunately, there's not many dependencies:
-- OpenJDK 8
+The application uses Gradle and can be used with Android Studio, but using
+Android Studio is not required. The build dependencies are:
+- OpenJDK 17
 - Android SDK: build tools (minimum `28.0.1`), platform `30`
-- Make sure to have the `$ANDROID_HOME` environment variable set.
+
+Python 3 is required to update generated files but not to build the app.
+
+For Android Studio users, no more setup is needed.
 
 For Nix users, the right environment can be obtained with `nix-shell ./shell.nix`.
 Instructions to install Nix are [here](https://nixos.wiki/wiki/Nix_Installation_Guide).
 
+If you don't use Android Studio or Nix, you have to inform Gradle about the
+location of your Android SDK by either:
+- Setting the `ANDROID_HOME` environment variable to point to the android sdk or
+- Creating the file `local.properties` and writing
+  `sdk.dir=<location_of_android_home>` into it.
+
 Building the debug apk:
 
 ```sh
-make
+./gradlew assembleDebug
 ```
 
-If the build succeed, the debug apk is located in `_build/juloo.keyboard2.debug.apk`.
+Nix users can call gradle directly: `gradle assembleDebug`.
 
-## Using the local debug.keystore on the Github CI actions
-
-It's possible to save the local debug.keystore into a github secret, so the same keystore is utilized to build the debug apk in the CI github actions.
-Doing this, they wil have the same signature, thus the debug apk can be updated without having to uninstall it first.
-
-After you sucessfully run `make`, (thus a debug.keystore exists) you can use this second command to generate a base64 stringified version of it
-
-```sh
-cd _build
-gpg -c --armor --pinentry-mode loopback --passphrase debug0 --yes "debug.keystore"
-```
-
-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. 
-
-The secret must be named `DEBUG_KEYSTORE`
+If the build succeeds, the debug apk is located in `build/outputs/apk/debug/app-debug.apk`.
 
 ## Debugging on your phone
 
 First [Enable adb debugging on your device](https://developer.android.com/studio/command-line/adb#Enabling).
-Then connect your phone to your computer using an USB cable or wireless
+Then connect your phone to your computer using an USB cable or via wireless
 debugging.
 
+If you use Android Studio, this process will be automatic and you don't have to
+follow this guide anymore.
+
 And finally, install the application with:
 ```sh
-make installd
+./gradlew installDebug
 ```
 
-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
 
-`make installd` can fail with the following error message:
+`./gradlew installDebug` can fail with the following error message:
 
 ```
-adb: failed to install _build/juloo.keyboard2.debug.apk: Failure [INSTALL_FAILED_UPDATE_INCOMPATIBLE: Package juloo.keyboard2.debug signatures do not match previously installed version; ignoring!]
-make: *** [Makefile:20: installd] Error 1
+FAILURE: Build failed with an exception.
+* What went wrong:
+Execution failed for task ':installDebug'.
+> java.util.concurrent.ExecutionException: com.android.builder.testing.api.DeviceException: com.android.ddmlib.InstallException: INSTALL_FAILED_UPDATE_INCOMPATIBLE: Existing package juloo.keyboard2.debug signatures do not match newer version; ignoring!
 ```
 
 The application can't be "updated" because the temporary certificate has been
@@ -73,30 +66,63 @@ The application must be enabled again in the settings.
 
 ```sh
 adb uninstall juloo.keyboard2.debug
-make installd
+./gradlew installDebug
 ```
 
+## Specifying a debug signing certificate on Github Actions
+
+It's possible to specify the signing certificate that the automated build
+should use.
+After you successfully run `./gradlew asssembleDebug`, (thus a debug.keystore
+exists) you can use this second command to generate a base64 stringified
+version of it:
+
+```sh
+gpg -c --armor --pinentry-mode loopback --passphrase debug0 --yes "debug.keystore"
+```
+
+This will create the file `debug.keystore.asc`, paste its content into a new
+Github secret named `DEBUG_KEYSTORE`.
+
 ## Guidelines
 
 ### Adding a layout
 
-Layouts are defined in XML, see `res/xml/qwerty.xml`.
+Layouts are defined in XML, see `srcs/layouts/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 `srcs/layouts` 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 `./gradlew genLayoutsList` 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 `./gradlew checkKeyboardLayouts` 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.
+A programming layout must contain all 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,21 +142,58 @@ 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.
 
-### Translations
+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 are always welcome !
+### Updating translations
 
-See for example: 1723288 (Latvian), baf867a (French).
-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).
+The text used in the app is written in `res/values-<language_tag>/strings.xml`.
+
+The list of language tags can be found in this
+[stackoverflow answer](https://stackoverflow.com/a/7989085)
+
+The first part before the `_` is used, for example,
+`res/values-fr/strings.xml` for French,
+`res/values-lv/strings.xml` for Latvian.
+
+Commented-out lines indicate missing translations:
+
+```xml
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+```
+
+Remove the `<!--` and `-->` parts and change the text.
+
+### Adding a translation
+
+The `res/values-<language_tag>/strings.xml` file must be created by copying the
+default translation in `res/values/strings.xml`, which contain the structure of
+the file and the English strings.
+
+To check that `strings.xml` is formatted correctly, run
+`./gradlew syncTranslations`. 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.
+The short description must not exceed 80 characters.
+Translating changelogs is not useful.
 
-The app name might be partially translated, the "unexpected" word should remain
+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`

Makefile

@@ -1,119 +0,0 @@
-# Configuration
-
-PACKAGE_NAME = juloo.keyboard2
-
-ANDROID_PLATFORM_VERSION = android-30
-JAVA_VERSION = 1.7
-
-SRC_DIR = srcs
-RES_DIR = res
-
-EXTRA_JARS =
-
-# /
-
-debug: _build/$(PACKAGE_NAME).debug.apk
-release: _build/$(PACKAGE_NAME).apk
-
-installd: _build/$(PACKAGE_NAME).debug.apk
-	adb install -r "$<"
-
-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
-
-.PHONY: release debug installd clean rebuild_special_font
-
-$(shell mkdir -p _build)
-
-ifndef ANDROID_HOME
-$(error ANDROID_HOME not set)
-endif
-
-ANDROID_BUILD_TOOLS = $(lastword $(sort $(wildcard $(ANDROID_HOME)/build-tools/*)))
-ANDROID_PLATFORM = $(ANDROID_HOME)/platforms/$(ANDROID_PLATFORM_VERSION)
-
-ifeq ($(shell [ -d "$(ANDROID_PLATFORM)" ] && echo ok),)
-$(error Android platform not found. Want $(ANDROID_PLATFORM_VERSION), \
-	found $(notdir $(wildcard $(ANDROID_HOME)/platforms/*)))
-endif
-
-JAVAC_FLAGS = -source $(JAVA_VERSION) -target $(JAVA_VERSION) -encoding utf8
-
-# Source files
-
-MANIFEST_FILE = AndroidManifest.xml
-JAVA_FILES = $(shell find $(SRC_DIR) -name '*.java')
-RES_FILES = $(shell find $(RES_DIR) -type f)
-
-# Debug signing
-
-DEBUG_KEYSTORE = _build/debug.keystore
-DEBUG_PASSWD = debug0
-
-$(DEBUG_KEYSTORE):
-	echo y | keytool -genkeypair -dname "cn=d, ou=e, o=b, c=ug" \
-		-alias debug -keypass $(DEBUG_PASSWD) -keystore "$@" \
-		-keyalg rsa -storepass $(DEBUG_PASSWD) -validity 10000
-
-_build/%.debug.apk: _build/%.debug.unsigned-apk $(DEBUG_KEYSTORE)
-	$(ANDROID_BUILD_TOOLS)/apksigner sign --in "$<" --out "$@" \
-		--ks $(DEBUG_KEYSTORE) --ks-key-alias debug --ks-pass "pass:$(DEBUG_PASSWD)"
-
-# Debug apk
-
-_build/$(PACKAGE_NAME).debug.unsigned-apk: AAPT_PACKAGE_FLAGS+=--rename-manifest-package $(PACKAGE_NAME).debug --product debug
-
-# Release signing
-
-# %-keystore.conf should declare KEYSTORE, KEYNAME and KEYSTOREPASS
-#  it is interpreted as a shell script
-_build/%.apk: _build/%.unsigned-apk %-keystore.conf
-	eval `cat $(word 2,$^)` && \
-	$(ANDROID_BUILD_TOOLS)/apksigner sign --in "$<" --out "$@" \
-		--ks "$$KEYSTORE" --ks-key-alias "$$KEYNAME" --ks-pass "pass:$$KEYSTOREPASS"
-
-# Package
-
-_build/%.unsigned-apk: _build/%.unaligned-apk
-	$(ANDROID_BUILD_TOOLS)/zipalign -fp 4 "$<" "$@"
-
-APK_EXTRA_FILES = classes.dex assets/special_font.ttf
-
-_build/%.unaligned-apk: $(addprefix _build/,$(APK_EXTRA_FILES)) $(MANIFEST_FILE)
-	$(ANDROID_BUILD_TOOLS)/aapt package -f -M $(MANIFEST_FILE) -S $(RES_DIR) \
-		-I $(ANDROID_PLATFORM)/android.jar -F "$@" $(AAPT_PACKAGE_FLAGS)
-	cd $(@D) && $(ANDROID_BUILD_TOOLS)/aapt add $(@F) $(APK_EXTRA_FILES)
-
-# Copy the special font file into _build because aapt requires relative paths
-_build/assets/special_font.ttf: srcs/special_font/result.ttf
-	mkdir -p $(@D)
-	cp "$<" "$@"
-
-# R.java
-
-GEN_DIR = _build/gen
-R_FILE = $(GEN_DIR)/$(subst .,/,$(PACKAGE_NAME))/R.java
-
-$(R_FILE): $(RES_FILES) $(MANIFEST_FILE)
-	mkdir -p "$(@D)"
-	$(ANDROID_BUILD_TOOLS)/aapt package -f -m -S $(RES_DIR) -J $(GEN_DIR) \
-		-M $(MANIFEST_FILE) -I $(ANDROID_PLATFORM)/android.jar
-
-# Compile java classes and build classes.dex
-
-OBJ_DIR = _build/class
-# A$B.class files are ignored
-# CLASS_FILES = $(JAVA_FILES:$(SRC_DIR)/%.java=$(OBJ_DIR)/%.class) \
-# 	$(R_FILE:$(GEN_DIR)/%.java=$(OBJ_DIR)/%.class)
-
-_build/classes.dex: $(JAVA_FILES) $(R_FILE)
-	mkdir -p $(OBJ_DIR)
-	javac -d $(OBJ_DIR) $(JAVAC_FLAGS) \
-		-classpath $(ANDROID_PLATFORM)/android.jar:$(EXTRA_JARS) \
-		-sourcepath $(SRC_DIR):$(GEN_DIR) \
-		$^
-	$(ANDROID_BUILD_TOOLS)/d8 --output $(@D) $(OBJ_DIR)/*/*/* $(subst :, ,$(EXTRA_JARS))

README.md

@@ -1,29 +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" /> |
-
-This app is a virtual keyboard for Android. The main features are easy typing of every ASCII character using the swipe gesture, dead keys for accents and modifier keys and the presence of special keys (tab, esc, arrows, etc..).
-
-The keyboard shows up to 4 extra characters in the corners of each key. These extra characters are hit by swiping the finger on the key.
-
-Highlight of some of the features:
-
-- Every character and special keys that are also available on 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/)
@@ -31,6 +7,24 @@ 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.
+
+https://github.com/Julow/Unexpected-Keyboard/assets/2310568/28f8f6fe-ac13-46f3-8c5e-d62443e16d0d
+
+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.
+
+| <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" /> |
+
+## Similar apps
+* [Calculator++](https://github.com/Bubu/android-calculatorpp) - Calculator with a similar UX, swipe to corners for advanced math symbols and operators. Works up to Android 13 but maybe unmaintained.
+
 ## Contributing
 
 For instructions on building the application, see

build.gradle

@@ -0,0 +1,167 @@
+plugins {
+  id 'com.android.application' version '8.1.1'
+}
+
+android {
+  namespace 'juloo.keyboard2'
+  compileSdk 33
+
+  defaultConfig {
+    applicationId "juloo.keyboard2"
+    minSdk 4
+    targetSdkVersion 33
+    versionCode 38
+    versionName "1.26.0"
+  }
+
+  sourceSets {
+    main {
+      manifest.srcFile 'AndroidManifest.xml'
+      java.srcDirs = ['srcs']
+      res.srcDirs = ['res', 'build/generated-resources']
+      assets.srcDirs = ['assets']
+    }
+  }
+
+  signingConfigs {
+    // Debug builds will always be signed. If no environment variables are set, a default
+    // keystore will be initialized by the task initDebugKeystore and used. This keystore
+    // can be uploaded to GitHub secrets by following instructions in CONTRIBUTING.md
+    // in order to always receive correctly signed debug APKs from the CI.
+    debug {
+      storeFile(System.env.DEBUG_KEYSTORE ? file(System.env.DEBUG_KEYSTORE) : file("debug.keystore"))
+      storePassword(System.env.DEBUG_KEYSTORE_PASSWORD ? "$System.env.DEBUG_KEYSTORE_PASSWORD" : "debug0")
+      keyAlias(System.env.DEBUG_KEY_ALIAS ? "$System.env.DEBUG_KEY_ALIAS" : "debug")
+      keyPassword(System.env.DEBUG_KEY_PASSWORD ? "$System.env.DEBUG_KEY_PASSWORD" : "debug0")
+    }
+
+    release {
+      if (System.env.RELEASE_KEYSTORE) {
+        storeFile file(System.env.RELEASE_KEYSTORE)
+        storePassword "$System.env.RELEASE_KEYSTORE_PASSWORD"
+        keyAlias "$System.env.RELEASE_KEY_ALIAS"
+        keyPassword "$System.env.RELEASE_KEY_PASSWORD"
+      }
+    }
+  }
+
+  buildTypes {
+    release {
+      minifyEnabled true
+      shrinkResources true
+      debuggable false
+      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt')
+      resValue "string", "app_name", "@string/app_name_release"
+      signingConfig signingConfigs.release
+    }
+
+    debug {
+      minifyEnabled false
+      shrinkResources false
+      debuggable true
+      applicationIdSuffix ".debug"
+      resValue "string", "app_name", "@string/app_name_debug"
+      resValue "bool", "debug_logs", "true"
+      signingConfig signingConfigs.debug
+    }
+  }
+
+  // Name outputs after the application ID.
+  android.applicationVariants.all { variant ->
+    variant.outputs.all {
+      outputFileName = "${applicationId}.apk"
+    }
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_7
+    targetCompatibility JavaVersion.VERSION_1_7
+  }
+}
+
+dependencies {
+
+}
+
+tasks.register('buildKeyboardFont') {
+  println "\nBuilding assets/special_font.ttf"
+  mkdir "$buildDir"
+  exec {
+    workingDir "$projectDir/srcs/special_font"
+    def svgFiles = workingDir.listFiles().findAll {
+      it.isFile() && it.name.endsWith(".svg")
+    }
+    commandLine("fontforge", "-lang=ff", "-script", "build.pe", "$buildDir/special_font.ttf", *svgFiles)
+  }
+  copy {
+    from "$buildDir/special_font.ttf"
+    into "assets"
+  }
+}
+
+tasks.withType(Test).configureEach {
+  dependsOn 'genLayoutsList'
+  dependsOn 'checkKeyboardLayouts'
+  dependsOn 'syncTranslations'
+}
+
+tasks.register('genLayoutsList') {
+  println "\nGenerating res/values/layouts.xml"
+  exec {
+    workingDir = projectDir
+    commandLine "python", "gen_layouts.py"
+  }
+}
+
+tasks.register('checkKeyboardLayouts') {
+  println "\nChecking layouts"
+  exec {
+    def layouts = new File(projectDir, "srcs/layouts").listFiles().findAll {
+      it.name.endsWith(".xml")
+    }
+    workingDir = projectDir
+    commandLine("python", "check_layout.py", *layouts)
+    standardOutput = new FileOutputStream("${projectDir}/check_layout.output")
+  }
+}
+
+tasks.register('syncTranslations') {
+  println "\nUpdating translations"
+  exec {
+    workingDir = projectDir
+    commandLine "python", "sync_translations.py"
+  }
+}
+
+tasks.named("preBuild") {
+  dependsOn += "initDebugKeystore"
+  dependsOn += "copyRawQwertyUS"
+  dependsOn += "copyLayoutDefinitions"
+}
+
+tasks.register('initDebugKeystore') {
+  if (!file("debug.keystore").exists()) {
+    println "Initializing default debug keystore"
+    exec {
+      // A shell script might be needed if this line requires input from the user
+      commandLine "keytool", "-genkeypair", "-dname", "cn=d, ou=e, o=b, c=ug", "-alias", "debug", "-keypass", "debug0", "-keystore", "debug.keystore", "-keyalg", "rsa", "-storepass", "debug0", "-validity", "10000"
+    }
+  }
+}
+
+// latn_qwerty_us is used as a raw resource by the custom layout option.
+tasks.register('copyRawQwertyUS')
+{
+  copy {
+    from "srcs/layouts/latn_qwerty_us.xml"
+    into "build/generated-resources/raw"
+  }
+}
+
+tasks.register('copyLayoutDefinitions')
+{
+  copy {
+    from "srcs/layouts"
+    into "build/generated-resources/xml"
+  }
+}

check_layout.output

@@ -0,0 +1,133 @@
+# arab_alt
+Layout includes some ASCII punctuation but not all, missing: !, ", ', +, -, /, :, ;, <, =, >, ?, [, \, ], _, |, ~
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+2 warnings
+# arab_hamvaj_tly
+Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], _, `, {, |, }
+Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder
+2 warnings
+# arab_pc
+Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
+1 warnings
+# arab_pc_ckb
+Layout includes some ASCII punctuation but not all, missing: ", %, ', +, ,, ., :, ;, <, =, >, ?, `, |, ~
+1 warnings
+# arab_pc_hindu
+Layout includes some ASCII punctuation but not all, missing: !, ', +, ;, ?, \, |
+1 warnings
+# arab_pc_ir
+Layout includes some ASCII punctuation but not all, missing: ", %, ', ,, /, ;, <, =, >, ?, [, \, ], `, {, |, }
+1 warnings
+# armenian_ph_am
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+1 warnings
+# beng_national
+Layout includes some ASCII punctuation but not all, missing: $
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+2 warnings
+# beng_provat
+Layout includes some ASCII punctuation but not all, missing: $, &, *, ., /, <, >, [, \, ], `, {, |, }
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+2 warnings
+# cyrl_jcuken_ru
+0 warnings
+# cyrl_jcuken_uk
+0 warnings
+# cyrl_ueishsht
+0 warnings
+# cyrl_yaverti
+Layout includes some ASCII punctuation but not all, missing: ~
+1 warnings
+# deva_alt
+Layout includes some ASCII punctuation but not all, missing: #, $, %, &, ', (, ), +, ., /, :, <, =, >, [, \, ], ^, _, `, {, |, }, ~
+Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder, tab
+2 warnings
+# deva_inscript
+Duplicate keys: ।
+Layout includes some ASCII punctuation but not all, missing: ", $, ', ^, _, `, |
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+3 warnings
+# grek_qwerty
+Duplicate keys: ;
+1 warnings
+# hang_dubeolsik_kr
+0 warnings
+# hebr_1_il
+Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
+1 warnings
+# hebr_2_il
+Layout includes some ASCII punctuation but not all, missing: (, ), <, >, [, ], {, }
+1 warnings
+# latn_azerty_fr
+0 warnings
+# latn_bepo_fr
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+1 warnings
+# latn_bone
+Layout includes some ASCII punctuation but not all, missing: $
+Layout redefines the bottom row but some important keys are missing, missing: cursor_left, cursor_right, loc end, loc home, loc page_down, loc page_up, loc switch_greekmath, loc voice_typing, switch_backward
+2 warnings
+# latn_colemak
+Some keys contain whitespaces, unexpected:  ́
+1 warnings
+# latn_dvorak
+0 warnings
+# latn_neo2
+Layout redefines the bottom row but some important keys are missing, missing: loc end, loc home, loc page_down, loc page_up
+1 warnings
+# latn_qwerty_br
+0 warnings
+# latn_qwerty_cz
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+1 warnings
+# latn_qwerty_es
+0 warnings
+# latn_qwerty_hu
+0 warnings
+# latn_qwerty_lv
+0 warnings
+# latn_qwerty_no
+0 warnings
+# latn_qwerty_pl
+0 warnings
+# latn_qwerty_ro
+0 warnings
+# latn_qwerty_se
+Duplicate keys: !, ', ,, -, ., ?
+1 warnings
+# latn_qwerty_tly
+Duplicate keys: a, c, g, j, q
+Layout doesn't define some important keys, missing: esc, f11_placeholder, f12_placeholder, tab
+2 warnings
+# latn_qwerty_tr
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+1 warnings
+# latn_qwerty_us
+0 warnings
+# latn_qwerty_vi
+0 warnings
+# latn_qwertz
+0 warnings
+# latn_qwertz_cz
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+1 warnings
+# latn_qwertz_cz_multifunctional
+Layout includes some ASCII punctuation but not all, missing: `
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+2 warnings
+# latn_qwertz_de
+0 warnings
+# latn_qwertz_fr_ch
+0 warnings
+# latn_qwertz_hu
+0 warnings
+# latn_qwertz_sk
+Layout includes some ASCII punctuation but not all, missing: `
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+2 warnings
+# urdu_phonetic_ur
+Duplicate keys:  
+Layout includes some ASCII punctuation but not all, missing: <, >, ?, `, |, ~
+Layout doesn't define some important keys, missing: f11_placeholder, f12_placeholder
+Some keys contain whitespaces, unexpected:  
+4 warnings

check_layout.py

@@ -0,0 +1,109 @@
+import xml.etree.ElementTree as ET
+import sys, os
+
+warning_count = 0
+
+KNOWN_NOT_LAYOUT = set([
+    "number_row", "numpad", "pin",
+    "bottom_row", "settings", "method",
+    "greekmath", "numeric", "emoji_bottom_row" ])
+
+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)))
+
+# Write to [keys] and [dup].
+def parse_row_from_et(row, keys, dup):
+    for key in row:
+        for attr in key.keys():
+            if attr.startswith("key"):
+                k = key.get(attr).removeprefix("\\")
+                if k in keys: dup.add(k)
+                keys.add(k)
+
+def parse_layout(fname):
+    keys = set()
+    dup = set()
+    root = ET.parse(fname).getroot()
+    if root.tag != "keyboard":
+        return None
+    for row in root:
+        parse_row_from_et(row, keys, dup)
+    return root, keys, dup
+
+def parse_row(fname):
+    keys = set()
+    dup = set()
+    root = ET.parse(fname).getroot()
+    if root.tag != "row":
+        return None
+    parse_row_from_et(root, keys, dup)
+    return root, keys, dup
+
+def check_layout(layout):
+    root, keys, dup = layout
+    if len(dup) > 0: warn("Duplicate keys: " + key_list_str(dup))
+    missing_some_of(keys, "~!@#$%^&*(){}`[]=\\-_;:/.,?<>'\"+|", "ASCII punctuation")
+    missing_some_of(keys, "0123456789", "digits")
+    missing_required(keys,
+                     ["esc", "tab", "backspace", "delete",
+                      "f11_placeholder", "f12_placeholder"],
+                     "Layout doesn't define some important keys")
+    unexpected_keys(keys,
+                    ["copy", "paste", "cut", "selectAll", "shareText",
+                     "pasteAsPlainText", "undo", "redo" ],
+                    "Layout contains editing keys")
+    unexpected_keys(keys,
+                    [ "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9",
+                     "f10", "f11", "f12" ],
+                    "Layout contains function keys")
+    unexpected_keys(keys, [""], "Layout contains empty strings")
+    unexpected_keys(keys, ["loc"], "Special keyword cannot be a symbol")
+    unexpected_keys(keys, filter(lambda k: k.strip()!=k, keys), "Some keys contain whitespaces")
+
+    _, bottom_row_keys, _ = parse_row("res/xml/bottom_row.xml")
+
+    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 sorted(sys.argv[1:]):
+    layout_id, _ = os.path.splitext(os.path.basename(fname))
+    if layout_id in KNOWN_NOT_LAYOUT:
+        continue
+    layout = parse_layout(fname)
+    if layout == None:
+        print("Not a layout file: %s" % layout_id)
+    else:
+        print("# %s" % layout_id)
+        warning_count = 0
+        check_layout(layout)
+        print("%d warnings" % warning_count)

gen_layouts.py

@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+
+# Generates the list of layouts in res/values/layouts.xml from the layout files
+# in srcs/layouts. 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" ]
+
+# 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 == 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
+    system_item = [ ("system", "@string/pref_layout_e_system") ]
+    custom_item = [ ("custom", "@string/pref_layout_e_custom") ]
+    values_items, entries_items = zip(*(system_item + layouts + custom_item)) # unzip
+    ids_items = map(lambda s: "@xml/%s" % s if s not in ["system", "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("srcs/layouts/*.xml")))
+with open("res/values/layouts.xml", "w") as out:
+    generate_arrays(out, layouts)

gradle.properties

@@ -0,0 +1,3 @@
+org.gradle.jvmargs=-Dfile.encoding=UTF-8
+android.useAndroidX=false
+android.nonTransitiveRClass=true

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Mon Aug 21 18:13:41 CEST 2023
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

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.

metadata/android/de-DE/short_description.txt

@@ -1 +1 @@
-Eine schlanke Bildschirmtastatur für Entwickler
+Eine schlanke, datenschutzfreundliche Bildschirmtastatur für Android.

metadata/android/en-US/changelogs/30.txt

@@ -0,0 +1 @@
+Bug fix release.

metadata/android/en-US/changelogs/31.txt

@@ -0,0 +1,7 @@
+New layouts: QWERTZ (Slovak)
+
+Bugs fixed.
+Updated translations.
+Tweaked themes and settings.
+
+Thanks to the contributors: Jozef Kundlak, @MAKI1LOVE

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

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

metadata/android/en-US/changelogs/34.txt

@@ -0,0 +1,3 @@
+Bug fixes.
+
+Thanks to the contributors: @doak

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

metadata/android/en-US/changelogs/36.txt

@@ -0,0 +1,9 @@
+Allow selecting any number of standard and custom layouts.
+Allow adding custom keys to the keyboard.
+Changed behavior of auto-added keys (often dead-keys).
+New layouts.
+Improved layouts and language support.
+Improved the space bar slider, and many more.
+Updated translations.
+
+Thanks to the contributors: @ChasmSolacer, @ElucGeek, @GoRaN909, @RZHSSNZDH, @Shareef101, @Validbit, @eandersons, @nitsvga, @polyctena, @sdrapha, @syskill

metadata/android/en-US/changelogs/37.txt

@@ -0,0 +1,8 @@
+Improved custom layout option.
+Allow selecting voice typing app with a long press.
+The numpad can work with other numeral systems.
+New and updated layouts.
+New themes.
+Many small improvements.
+
+Thanks to the contributors: @pharook, @syskill, @ojas-bhagavath, @lrvideckis, @lyubomirv, @matthiakl, @deftkHD, @V6lhost, @RZHSSNZDH, @RetrogisusDEV, @rafasaurus, @krtsgnr7230, @eandersons, @ChasmSolacer, @Validbit, @polyctena

metadata/android/en-US/changelogs/38.txt

@@ -0,0 +1,7 @@
+The custom vibration setting is back.
+Allow to hide the keyboard switching key.
+Fixed modifier keys in some development apps.
+Updated translations.
+Bug fixes and general improvements.
+
+Many thanks to the contributors: @abb128, @marciozomb13, @RetrogisusDEV, @Sestowner, @vedamanavi, @krtsgnr7230

metadata/android/en-US/full_description.txt

@@ -1,18 +1,6 @@
-This app is a virtual keyboard for Android. The main features are easy typing of every ASCII character using the swipe gesture, dead keys for accents and modifier keys and the presence of special keys (tab, esc, arrows, etc..).
+The main feature is that you can type more characters by swiping the keys towards the corners.
 
-The keyboard shows up to 4 extra characters in the corners of each key. These extra characters are hit by swiping the finger on the key.
+This application was originally designed for programmers using Termux.
+Now perfect for everyday use.
 
-Highlight of some of the features:
-
-- Every character and special keys that are also available on 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.

metadata/android/en-US/short_description.txt

@@ -1 +1 @@
-A lightweight virtual keyboard for developers.
+Lightweight and privacy-conscious virtual keyboard for Android.

metadata/android/en-US/video.txt

@@ -0,0 +1 @@
+https://www.youtube.com/watch?v=rwGvWesPFX8

metadata/android/es-ES/full_description.txt

@@ -0,0 +1,6 @@
+La característica principal es que hay acceso a más caractéres deslizando hacia las esquinas de las teclas.
+
+Esta aplicación fue originalmente diseñada para programadores que usaran Termux.
+Ahora es perfecta para uso cotidiano.
+
+La misma no contiene ningún anuncio/publicidad, no realiza peticiones de red y es de Fuente Abierta. 

metadata/android/es-ES/short_description.txt

@@ -1 +1 @@
-Un teclado virtual ligero para desarrolladores.
+Un teclado virtual ligero para Android consciente de su privacidad.

metadata/android/fr-FR/full_description.txt

@@ -1,18 +1,6 @@
-Cette application est un clavier virtuel pour Android. Les fonctionnalités principales sont l'accès rapide à tous les caractères ASCII en glissant le doigt, les touches mortes pour les accents et la présence des touches spéciales (Tab, Esc, les flèches, etc..).
+La fonctionnalité principale est l'accès rapide à plus de caractères en balayant les touches vers les coins.
 
-Il peut y avoir un caractère supplémentaire dans chaque coin de chaque touche. Ces caractères sont tapés en glissant le doigt sur la touche.
+Cette application a été conçue à l'origine pour les programmeurs utilisant Termux.
+Elle est maintenant parfaite pour une utilisation quotidienne.
 
-Quelques fonctionnalités:
-
-- 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.

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.

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.

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.

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.

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.

metadata/android/pt-BR/title.txt

@@ -1 +1 @@
-Unexpected Keyboard
+Teclado Unexpected

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.

metadata/android/ro-RO/short_description.txt

@@ -0,0 +1 @@
+Tastatură virtuală pentru Android, ușoară și respectuoasă cu viața privată.

metadata/android/ro-RO/title.txt

@@ -0,0 +1 @@
+Unexpected Keyboard

metadata/android/ru-RU/full_description.txt

@@ -0,0 +1,6 @@
+Главная особенность клавиатуры - это возможность легко напечатать любой ASCII символ за счет свайпов в углы клавиш.
+
+Приложение изначально было разработано для использования Termux.
+На данный момент, оно также удобно в повседневном использовании.
+
+Приложение не содержит рекламы, не осуществляет никаких запросов в сеть и имеет открытый исходный код.

metadata/android/ru-RU/short_description.txt

@@ -0,0 +1 @@
+Легкая клавиатура для пользователей, заботящихся о конфиденциальности.

metadata/android/ru-RU/title.txt

@@ -0,0 +1 @@
+Unexpected Keyboard

metadata/android/tr-TR/full_description.txt

@@ -0,0 +1,6 @@
+Bu uygulama özünde tuşların kenarlarından kaydırarak daha fazla karakter yazabilmek amacıyla geliştirildi.
+
+Bu uygulama aslında Termux kullanıcıları için geliştirildi.
+Artık gündelik kullanım için de uygun.
+
+Bu uygulama açık kaynaklıdır. Reklam içermez ve internete bağlanmaz.

metadata/android/tr-TR/short_description.txt

@@ -0,0 +1 @@
+Android için hafif ve güvenlik odaklı bir sanal klavye uygulaması.

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ở.

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.

res/drawable/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+  <solid android:color="#ff101010"/>
+</shape>

res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="1100.0dip" android:width="1100.0dip" android:viewportWidth="1100.0" android:viewportHeight="1100.0">
+  <path android:fillColor="#fc2a2a2a" android:pathData="M549.19,211.58L838.49,211.58A66.72 66.72 0 0 1 905.21,278.30L905.21,731.23A66.72 66.72 0 0 1 838.49,797.95L549.19,797.95A66.72 66.72 0 0 1 482.47,731.23L482.47,278.30A66.72 66.72 0 0 1 549.19,211.58zM38.60,272.97L38.60,725.90A66.72 66.72 0 0 0 105.32,792.62L394.62,792.62A66.72 66.72 0 0 0 461.34,725.90L461.34,272.97A66.72 66.72 0 0 0 394.62,206.25L105.32,206.25A66.72 66.72 0 0 0 38.60,272.97z" android:strokeLineCap="round" android:strokeLineJoin="round" android:fillType="nonZero"/>
+  <path android:fillColor="#ffffffff" android:pathData="M662.14,510.10L662.14,648.69" android:strokeColor="#ffffffff" android:strokeWidth="20.380417" android:strokeLineCap="square" android:strokeLineJoin="miter" android:fillType="nonZero"/>
+  <path android:fillColor="#00ffffff" android:pathData="M662.14,531.42C778.39,456.79,778.39,659.35,662.14,595.39" android:strokeColor="#ffffffff" android:strokeWidth="20.380417" android:strokeLineCap="round" android:strokeLineJoin="miter" android:fillType="nonZero"/>
+  <path android:fillColor="#00ffffff" android:pathData="M852.37,264.89C869.88,264.89,884.07,286.37,884.07,312.86C884.07,339.36,869.88,360.84,852.37,360.84C834.86,360.84,820.66,339.36,820.66,312.86C820.66,286.37,834.86,264.89,852.37,264.89z" android:strokeColor="#ffffffff" android:strokeWidth="20.380417" android:strokeLineCap="round" android:strokeLineJoin="miter" android:fillType="nonZero"/>
+  <path android:fillColor="#00ffffff" android:pathData="M514.18,659.35Q545.88,712.66,514.18,776.63" android:strokeColor="#ffffffff" android:strokeWidth="20.380417" android:strokeLineCap="round" android:strokeLineJoin="miter" android:fillType="nonZero"/>
+  <path android:fillColor="#00ffffff" android:pathData="M254.75,520.69C281.29,520.69,302.81,542.19,302.81,568.70C302.81,595.21,281.29,616.71,254.75,616.71C228.21,616.71,206.69,595.21,206.69,568.70C206.69,542.19,228.21,520.69,254.75,520.69z" android:strokeColor="#fffdfdfd" android:strokeWidth="20.380417" android:strokeLineCap="round" android:strokeLineJoin="miter" android:fillType="nonZero"/>
+  <path android:fillColor="#00ffffff" android:pathData="M403.36,265.80C417.87,265.80,429.63,277.53,429.63,292.00C429.63,306.46,417.87,318.19,403.36,318.19C388.86,318.19,377.09,306.46,377.09,292.00C377.09,277.53,388.86,265.80,403.36,265.80z" android:strokeColor="#ffffffff" android:strokeWidth="20.380417" android:strokeLineCap="round" android:strokeLineJoin="miter" android:fillType="nonZero"/>
+  <path android:fillColor="#fc2a2a2a" android:pathData="M337.82,845.92L627.12,845.92A66.72 66.72 0 0 1 693.84,912.64L693.84,1365.58A66.72 66.72 0 0 1 627.12,1432.29L337.82,1432.29A66.72 66.72 0 0 1 271.11,1365.58L271.11,912.64A66.72 66.72 0 0 1 337.82,845.92zM-183.33,901.98L-183.33,1354.91A66.72 66.72 0 0 0 -116.62,1421.63L172.69,1421.63A66.72 66.72 0 0 0 239.40,1354.91L239.40,901.98A66.72 66.72 0 0 0 172.69,835.26L-116.62,835.26A66.72 66.72 0 0 0 -183.33,901.98zM-183.33,901.98L-183.33,1354.91A66.72 66.72 0 0 0 -116.62,1421.63L172.69,1421.63A66.72 66.72 0 0 0 239.40,1354.91L239.40,901.98A66.72 66.72 0 0 0 172.69,835.26L-116.62,835.26A66.72 66.72 0 0 0 -183.33,901.98z" android:strokeLineCap="round" android:strokeLineJoin="round" android:fillType="nonZero"/>
+  <path android:fillColor="#00ffffff" android:pathData="M397.93,360.84L429.63,296.87" android:strokeColor="#ffffffff" android:strokeWidth="20.380417" android:strokeLineCap="round" android:strokeLineJoin="round" android:fillType="nonZero"/>
+  <path android:fillColor="#00ffffff" android:pathData="M651.57,883.24L651.57,968.53" android:strokeColor="#ffffffff" android:strokeWidth="20.380417" android:strokeLineCap="round" android:strokeLineJoin="round" android:fillType="nonZero"/>
+  <path android:fillColor="#00ffffff" android:pathData="M197.13,883.24Q207.70,883.24,207.70,893.90L207.70,936.54Q218.26,947.21,207.70,957.87L207.70,968.53" android:strokeColor="#ffffffff" android:strokeWidth="20.380417" android:strokeLineCap="round" android:strokeLineJoin="round" android:fillType="nonZero"/>
+</vector>

res/layout/dialog_edit_text.xml

@@ -0,0 +1,4 @@
+<?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="wrap_content">
+  <EditText android:id="@+id/text" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_margin="10dp"/>
+</LinearLayout>

res/layout/emoji_pane.xml

@@ -3,9 +3,6 @@
   <juloo.keyboard2.EmojiGroupButtonsBar android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"/>
   <juloo.keyboard2.EmojiGridView android:id="@+id/emoji_grid" android:layout_width="fill_parent" android:layout_height="@dimen/emoji_grid_height" android:orientation="vertical" android:numColumns="auto_fit" android:columnWidth="45sp" android:background="?attr/colorKeyboard"/>
   <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content">
-    <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" key="switch_back_emoji"/>
-    <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" android:layout_weight="4" key="space"/>
-    <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" key="backspace"/>
-    <juloo.keyboard2.EmojiKeyButton style="@style/emojiKeyButton" key="enter"/>
+    <juloo.keyboard2.Keyboard2View layout="@xml/emoji_bottom_row" android:layout_width="fill_parent" android:layout_height="wrap_content" android:background="?attr/emoji_key_bg"/>
   </LinearLayout>
 </LinearLayout>

res/layout/launcher_activity.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true">
+  <LinearLayout 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"/>
+    <Button style="@style/paragraph" android:text="@string/launcher_button_imepicker" android:onClick="launch_imepicker" android:layout_width="wrap_content"/>
+    <VideoView android:id="@+id/launcher_intro_video" android:layout_width="240dp" android:layout_height="wrap_content" android:layout_gravity="center"/>
+    <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"/>
+    <TextView style="@style/paragraph" android:text="@string/launcher_sourcecode"/>
+    <TextView style="@style/paragraph" android:text="https://github.com/Julow/Unexpected-Keyboard" android:autoLink="web" android:linksClickable="true"/>
+  </LinearLayout>
+</ScrollView>

res/layout/pref_layouts_add_btn.xml

@@ -0,0 +1,4 @@
+<?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="wrap_content" android:gravity="center" android:minHeight="?android:attr/listPreferredItemHeightSmall">
+  <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/pref_layouts_add" android:textAppearance="?android:attr/textAppearanceListItemSmall"/>
+</LinearLayout>

res/layout/pref_listgroup_add_btn.xml

@@ -0,0 +1,4 @@
+<?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="wrap_content" android:gravity="center">
+  <View android:layout_width="@dimen/pref_button_size" android:layout_height="@dimen/pref_button_size" android:background="@android:drawable/ic_menu_add"/>
+</LinearLayout>

res/layout/pref_listgroup_group.xml

@@ -0,0 +1,3 @@
+<?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="wrap_content" android:gravity="center">
+</LinearLayout>

res/layout/pref_listgroup_item_widget.xml

@@ -0,0 +1,4 @@
+<?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="horizontal">
+  <Button android:id="@+id/pref_listgroup_remove_btn" android:layout_width="@dimen/pref_button_size" android:layout_height="@dimen/pref_button_size" android:layout_gravity="center" android:background="@android:drawable/ic_menu_close_clear_cancel"/>
+</LinearLayout>

res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@drawable/ic_launcher_background"/>
+  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

res/values-cs/strings.xml

@@ -1,47 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name" product="debug">Klávesnice Unexpected (pro ladění)</string>
-  <string name="app_name" product="default">Klávesnice Unexpected</string>
+  <string name="app_name_release">Klávesnice Unexpected</string>
+  <string name="app_name_debug">Klávesnice Unexpected (pro ladění)</string>
   <string name="settings_activity_label">Nastavení Klávesnice Unexpected</string>
+  <string name="pref_portrait">V režimu na výšku</string>
+  <string name="pref_landscape">V režimu na šířku</string>
   <string name="pref_category_layout">Rozvržení</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_layout_title">Změnit rozvržení klávesnice</string>
-  <string name="pref_layout_e_system">V nastavení systému</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
-  <string name="pref_accents_title">(Univerzální) Diakritická znaménka</string>
-  <string name="pref_accents_e_all_installed">Zobrazovat znaménka pro všechny instalované systémové jazyky</string>
-  <string name="pref_accents_e_selected">Zobrazovat znaménka pouze pro současně zvolený jazyk</string>
-  <string name="pref_accents_e_none">Skrýt (univerzální) diakritická znaménka</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">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_label_brightness">Upravit jas nápisu</string>
+  <string name="pref_keyboard_opacity">Upravit průhlednost pozadí klávesnice</string>
+  <string name="pref_key_opacity">Upravit průhlednost kláves</string>
+  <string name="pref_key_activated_opacity">Upravit průhlednost stisknutých kláves</string>
+  <string name="pref_layout_e_system">Dle nastavení systému</string>
+  <string name="pref_layout_e_custom">Vlastní rozvržení</string>
+  <string name="pref_layouts_add">Přidat alternativní rozložení</string>
+  <string name="pref_layouts_item">Rozložení %1$d: %2$s</string>
+  <string name="pref_layouts_remove_custom">Odebrat rozložení</string>
+  <string name="pref_custom_layout_title">Vlastní rozložení</string>
+  <string name="pref_show_numpad_title">Zobrazit NumPad</string>
+  <string name="pref_show_numpad_never">Nikdy</string>
+  <string name="pref_show_numpad_landscape">Pouze v režimu na šířku</string>
+  <string name="pref_show_numpad_always">Vždy</string>
+  <string name="pref_number_row_title">Zobrazit řádek s čísly</string>
+  <string name="pref_number_row_summary">Přidá řádek s čísly nad klávesnici, pokud je NumPad skrytý</string>
+  <string name="pref_numpad_layout">Rozložení NumPadu</string>
+  <string name="pref_numpad_layout_e_high_first">Vyšší číslice jako první (horní řádek 789)</string>
+  <string name="pref_numpad_layout_e_low_first">Nižší číslice jako první (horní řádek 123)</string>
+  <string name="pref_extra_keys_title">Přidat klávesy do klávesnice</string>
+  <string name="pref_extra_keys_custom">Přidat vlastní klávesy</string>
+  <string name="pref_extra_keys_internal">Výbrané klávesy k přidaní do klávesnice</string>
+  <string name="pref_second_layout_title">Vedlejší rozvržení</string>
   <string name="pref_second_layout_none">Žádné</string>
   <string name="pref_category_typing">Psaní</string>
   <string name="pref_swipe_dist_title">Vzdálenost posunutí prstem</string>
-  <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_swipe_dist_summary">Jak daleko je třeba posunout prst pro zadání znaku/znaménka v rohu 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_lock_double_tap_title">Dvojklik pro aktivaci Capslock(u)</string>
+  <string name="pref_lock_double_tap_summary">Umožňuje zamknout Shift dvojklikem, namísto podržení</string>
+  <string name="pref_category_behavior">Chování</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">Přepnout na posledně užívanou klávesnici</string>
+  <string name="pref_switch_input_immediate_summary">Jak bude klávesa pro přepnutí klávesnice reagovat</string>
+  <!-- <string name="pref_vibrate_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <string name="pref_pin_entry_enabled_title">Rozvržení zadávání PIN kódu</string>
+  <string name="pref_pin_entry_enabled_summary">Automaticky při psaní čísel, datumů a telefonních čísel</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>
-  <string name="pref_keyboard_height_landscape_title">Výška klávesnice v režimu na šířku</string>
   <string name="pref_horizontal_margin_title">Boční odsazení</string>
   <string name="pref_character_size_title">Velikost znaků</string>
   <string name="pref_character_size_summary">Velikost znaků zobrazených na klávesnici (%.2fx)</string>
@@ -50,7 +57,11 @@
   <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_white">White</string> -->
+  <string name="pref_theme_e_altblack">Černý (alternativní)</string>
+  <string name="pref_theme_e_white">Bílý</string>
+  <string name="pref_theme_e_epaper">ePapír</string>
+  <string name="pref_theme_e_desert">Poušťě</string>
+  <string name="pref_theme_e_jungle">Džungle</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>
@@ -58,13 +69,36 @@
   <string name="pref_swipe_dist_e_very_far">Velmi dlouhá</string>
   <string name="pref_key_horizontal_space">Horizontální mezery mezi klávesami</string>
   <string name="pref_key_vertical_space">Vertikální mezery mezi klávesami</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="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">Aktivovat klávesnici</string>
+  <string name="launcher_button_imepicker">Vybrat klávesnici</string>
+  <string name="launcher_description">Tato aplikace je pouhou virtuální klávesnicí. Přejděte do systémového nastavení, kliknutím na tlačítko níže a aktivujte ji.</string>
+  <string name="launcher_sourcecode">Toto je volná, open-source aplikace. Její zdrojový kód, či hlášení chyb, naleznete na Githubu.</string>
+  <string name="launcher_tryhere">Po aktivaci můžete klávesnici rovnou vyzkoušet zde:</string>
+  <string name="key_descr_capslock">Caps lock</string>
+  <string name="key_descr_switch_greekmath">Řecké a matematické symboly</string>
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <string name="key_descr_voice_typing">Hlasové zadávání</string>
+  <string name="key_descr_copy">Kopírovat</string>
+  <string name="key_descr_paste">Vložit</string>
+  <string name="key_descr_cut">Vyjmout</string>
+  <string name="key_descr_selectAll">Označit vše</string>
+  <string name="key_descr_shareText">Sdílet text</string>
+  <string name="key_descr_pasteAsPlainText">Vložit jako prostý text</string>
+  <string name="key_descr_undo">Zpět</string>
+  <string name="key_descr_redo">Znovu</string>
+  <string name="key_descr_ª">Indikátor řadové číslovky</string>
+  <string name="key_descr_º">Indikátor řadové číslovky</string>
+  <string name="key_descr_superscript">Horní index</string>
+  <string name="key_descr_subscript">Dolní index</string>
+  <string name="key_descr_page_up">Page Up</string>
+  <string name="key_descr_page_down">Page Down</string>
+  <string name="key_descr_home">Home</string>
+  <string name="key_descr_end">End</string>
+  <string name="pref_category_advanced">Pokročilé</string>
 </resources>

res/values-de/strings.xml

@@ -1,56 +1,67 @@
 <?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_release">Unexpected Keyboard</string>
+  <string name="app_name_debug">Unexpected Keyboard (Debug)</string>
   <string name="settings_activity_label">Unexpected Keyboard - Einstellungen</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_layout_title">Tastaturlayout ändern</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_e_system">Systemeinstellung</string>
-  <!-- <string name="pref_layout_e_custom">Custom 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>
-  <string name="pref_accents_e_none">Akzente verbergen</string>
+  <string name="pref_layout_e_custom">Eigenes Layout</string>
+  <string name="pref_layouts_add">Alternatives Layout hinzufügen</string>
+  <string name="pref_layouts_item">Layout %1$d: %2$s</string>
+  <string name="pref_layouts_remove_custom">Layout entfernen</string>
+  <string name="pref_custom_layout_title">Eigenes Layout</string>
   <string name="pref_show_numpad_title">Ziffernblock anzeigen</string>
   <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_extra_keys_custom">Benutzerdefinierte Tasten hinzufügen</string>
+  <string name="pref_extra_keys_internal">Tasten auswählen, die der Tastatur hinzugefügt werden sollen</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_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <string name="pref_pin_entry_enabled_title">PIN-Eingabe-Layout</string>
+  <string name="pref_pin_entry_enabled_summary">Für die Nummern-, Datums- und Telefonnummern-Eingabe</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_keyboard_height_landscape_title">Höhe der Tastatur im Querformat</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_theme_e_desert">Wüste</string>
+  <string name="pref_theme_e_jungle">Dschungel</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>
@@ -58,13 +69,36 @@
   <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="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_button_imepicker">Tastatur auswählen</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 Github. Dort können auch Bugs gemeldet werden.</string>
+  <string name="launcher_tryhere">Nach Aktivierung kannst du die Tastatur hier ausprobieren:</string>
+  <string name="key_descr_capslock">Feststelltaste</string>
+  <string name="key_descr_switch_greekmath">Griechische &amp; mathematische Symbole</string>
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <string name="key_descr_voice_typing">Spracheingabe</string>
+  <string name="key_descr_copy">Kopieren</string>
+  <string name="key_descr_paste">Einfügen</string>
+  <string name="key_descr_cut">Ausschneiden</string>
+  <string name="key_descr_selectAll">Alles auswählen</string>
+  <string name="key_descr_shareText">Text teilen</string>
+  <string name="key_descr_pasteAsPlainText">Unformatiert einfügen</string>
+  <string name="key_descr_undo">Rückgängig</string>
+  <string name="key_descr_redo">Wiederholen</string>
+  <string name="key_descr_ª">Ordinalzeichen</string>
+  <string name="key_descr_º">Ordinalzeichen</string>
+  <string name="key_descr_superscript">Hochgestellt</string>
+  <string name="key_descr_subscript">Tiefgestellt</string>
+  <string name="key_descr_page_up">Bild auf</string>
+  <string name="key_descr_page_down">Bild ab</string>
+  <string name="key_descr_home">Pos1</string>
+  <string name="key_descr_end">Ende</string>
+  <string name="pref_category_advanced">Erweitert</string>
 </resources>

res/values-es/strings.xml

@@ -1,70 +1,104 @@
 <?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_release">Unexpected Keyboard</string>
+  <string name="app_name_debug">Unexpected Keyboard (debug)</string>
   <string name="settings_activity_label">Ajustes de Unexpected Keyboard</string>
-  <string name="pref_category_layout">Formato</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_layout_title">Cambiar formato de teclado</string>
-  <string name="pref_layout_e_system">Ajustes del sistema</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
-  <string name="pref_accents_title">Acentos</string>
-  <string name="pref_accents_e_all_installed">Mostrar acentos para todos los lenguajes instalados</string>
-  <string name="pref_accents_e_selected">Solo mostrar acentos para el lenguaje seleccionado</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">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> -->
-  <string name="pref_category_typing">Escribiendo</string>
-  <string name="pref_swipe_dist_title">Distancia para deslizar</string>
-  <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_portrait">En modo vertical</string>
+  <string name="pref_landscape">En modo horizontal</string>
+  <string name="pref_category_layout">Distribución</string>
+  <string name="pref_label_brightness">Ajustar brillo de etiqueta</string>
+  <string name="pref_keyboard_opacity">Ajustar opacidad del fondo del teclado</string>
+  <string name="pref_key_opacity">Ajustar opacidad de teclas</string>
+  <string name="pref_key_activated_opacity">Ajustar opacidad de teclas presionadas</string>
+  <string name="pref_layout_e_system">Igual al sistema</string>
+  <string name="pref_layout_e_custom">Diseño personalizado</string>
+  <string name="pref_layouts_add">Añadir distribución alterna</string>
+  <string name="pref_layouts_item">Diseño %1$d: %2$s</string>
+  <string name="pref_layouts_remove_custom">Quitar diseño</string>
+  <string name="pref_custom_layout_title">Diseño personalizado</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">Solo en modo horizontal</string>
+  <string name="pref_show_numpad_always">Siempre</string>
+  <string name="pref_number_row_title">Mostrar fila de números</string>
+  <string name="pref_number_row_summary">Agrega la fila numérica a la parte superior del teclado si el teclado numérico está oculto</string>
+  <string name="pref_numpad_layout">Diseño del teclado numérico</string>
+  <string name="pref_numpad_layout_e_high_first">Dígitos descendientes</string>
+  <string name="pref_numpad_layout_e_low_first">Dígitos ascendientes</string>
+  <string name="pref_extra_keys_title">Agregar teclas</string>
+  <string name="pref_extra_keys_custom">Agregar teclas personalizadas</string>
+  <string name="pref_extra_keys_internal">Selecciona teclas para agregar al teclado</string>
+  <string name="pref_second_layout_title">Formato secundario</string>
+  <string name="pref_second_layout_none">Ninguno</string>
+  <string name="pref_category_typing">Escritura</string>
+  <string name="pref_swipe_dist_title">Distancia de deslizamiento</string>
+  <string name="pref_swipe_dist_summary">Distancia de caracteres en las esquinas de las teclas (%s)</string>
+  <string name="pref_long_timeout_title">Tiempo de espera para repetir 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_lock_double_tap_title">Doble toque en Mayús para bloquear las mayúsculas</string>
+  <string name="pref_lock_double_tap_summary">Se puede bloquear cualquier modificador manteniéndolo presionado</string>
+  <string name="pref_category_behavior">Comportamiento</string>
+  <string name="pref_autocapitalisation_title">Mayúsculas automáticas</string>
+  <string name="pref_autocapitalisation_summary">Presionar Mayús al principio de una oración</string>
+  <string name="pref_switch_input_immediate_title">Cambiar al último teclado usado</string>
+  <string name="pref_switch_input_immediate_summary">Comportamiento de la tecla para cambiar diseño</string>
+  <!-- <string name="pref_vibrate_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <string name="pref_pin_entry_enabled_title">Diseño de introducción de PIN</string>
+  <string name="pref_pin_entry_enabled_summary">Para escribir cifras, fechas y números telefónicos</string>
   <string name="pref_category_style">Estilo</string>
-  <string name="pref_margin_bottom_title">Margen del pie</string>
+  <string name="pref_margin_bottom_title">Margen inferior</string>
   <string name="pref_keyboard_height_title">Altura del teclado</string>
-  <!-- <string name="pref_keyboard_height_landscape_title">Keyboard height in landscape mode</string> -->
   <string name="pref_horizontal_margin_title">Margen horizontal</string>
   <string name="pref_character_size_title">Tamaño de etiqueta</string>
   <string name="pref_character_size_summary">Tamaño de caracteres mostrados en el teclado (%.2fx)</string>
   <string name="pref_theme">Tema</string>
-  <string name="pref_theme_e_system">Ajustes de sistema</string>
+  <string name="pref_theme_e_system">Igual al sistema</string>
   <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_white">White</string> -->
-  <string name="pref_swipe_dist_e_very_short">Muy corto</string>
-  <string name="pref_swipe_dist_e_short">Corto</string>
+  <string name="pref_theme_e_altblack">Negro alternativo</string>
+  <string name="pref_theme_e_white">Blanco</string>
+  <string name="pref_theme_e_epaper">ePaper</string>
+  <string name="pref_theme_e_desert">Desierto</string>
+  <string name="pref_theme_e_jungle">Selva</string>
+  <string name="pref_swipe_dist_e_very_short">Muy corta</string>
+  <string name="pref_swipe_dist_e_short">Corta</string>
   <string name="pref_swipe_dist_e_default">Normal</string>
-  <string name="pref_swipe_dist_e_far">Lejano</string>
-  <string name="pref_swipe_dist_e_very_far">Muy lejano</string>
+  <string name="pref_swipe_dist_e_far">Larga</string>
+  <string name="pref_swipe_dist_e_very_far">Muy larga</string>
   <string name="pref_key_horizontal_space">Espaciado horizontal entre las teclas</string>
   <string name="pref_key_vertical_space">Espaciado vertical entre las 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="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">Habilitar teclado</string>
+  <string name="launcher_button_imepicker">Seleccionar método de entrada</string>
+  <string name="launcher_description">Esta aplicación es un teclado virtual. Presiona el botón de abajo para ir a Ajustes y habilitar Unexpected Keyboard.</string>
+  <string name="launcher_sourcecode">Esta es una aplicación gratuita, libre y de código abierto. Puedes encontrar el código fuente o reportar errores en GitHub.</string>
+  <string name="launcher_tryhere">Tras habilitarlo, puedes probar el teclado en este campo:</string>
+  <string name="key_descr_capslock">Bloq Mayús</string>
+  <string name="key_descr_switch_greekmath">Símb. griegos y matemáticos</string>
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <string name="key_descr_voice_typing">Dictado por voz</string>
+  <string name="key_descr_copy">Copiar</string>
+  <string name="key_descr_paste">Pegar</string>
+  <string name="key_descr_cut">Cortar</string>
+  <string name="key_descr_selectAll">Seleccionar todo</string>
+  <string name="key_descr_shareText">Compartir texto</string>
+  <string name="key_descr_pasteAsPlainText">Pegar como texto sin formato</string>
+  <string name="key_descr_undo">Deshacer</string>
+  <string name="key_descr_redo">Rehacer</string>
+  <string name="key_descr_ª">Indicador de ordinal</string>
+  <string name="key_descr_º">Indicador de ordinal</string>
+  <string name="key_descr_superscript">Superíndice</string>
+  <string name="key_descr_subscript">Subíndice</string>
+  <string name="key_descr_page_up">Av Pág</string>
+  <string name="key_descr_page_down">Re Pág</string>
+  <string name="key_descr_home">Inicio</string>
+  <string name="key_descr_end">Fin</string>
+  <string name="pref_category_advanced">Avanzado</string>
 </resources>

res/values-fa/strings.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name_release">صفحه کلید غیرمنتظره</string>
+  <string name="app_name_debug">صفحه کلید غیرمنتظره</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_e_system">تنظیمات سامانه</string>
+  <string name="pref_layout_e_custom">طرح صفارشی</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
+  <string name="pref_custom_layout_title">طرح شخصی</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_extra_keys_custom">Add custom keys</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</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_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</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_theme_e_desert">Desert</string> -->
+  <!-- <string name="pref_theme_e_jungle">Jungle</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="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_button_imepicker">Select keyboard</string> -->
+  <string name="launcher_description">این برنامه یک صفحه کلید مجازی است. با کلیک روی گزینه زیر به تنظیمات سامانه بروید و صفحه کلید غیرمنتظره را فعال کنید.</string>
+  <string name="launcher_sourcecode">این یک برنامه متن باز و آزاد است. شما می‌توانید کد منبع را در گیتهاب پیدا کرده و نیز باگ‌ها را گزارش کنید.</string>
+  <string name="launcher_tryhere">بعد از فعالسازی، صفحه کلید را اینجا امتحان کنید:</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <!-- <string name="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
+  <string name="pref_category_advanced">پیشرفته</string>
+</resources>

res/values-fr/strings.xml

@@ -1,30 +1,33 @@
 <?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_release">Unexpected Keyboard</string>
+  <string name="app_name_debug">Unexpected Keyboard (debug)</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_layout_title">Disposition des touches</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_e_system">Paramètre système</string>
   <string name="pref_layout_e_custom">Disposition personnalisée</string>
-  <string name="pref_accents_title">Accents</string>
-  <string name="pref_accents_e_all_installed">Afficher les accents pour les langues installées</string>
-  <string name="pref_accents_e_selected">Afficher les accents pour la langue sélectionnée</string>
-  <string name="pref_accents_e_none">Cacher les accents</string>
+  <string name="pref_layouts_add">Ajouter un clavier alternatif</string>
+  <string name="pref_layouts_item">Disposition %1$d: %2$s</string>
+  <string name="pref_layouts_remove_custom">Supprimer</string>
+  <string name="pref_custom_layout_title">Disposition personnalisée</string>
   <string name="pref_show_numpad_title">Afficher le pavé numérique</string>
   <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_extra_keys_custom">Ajouter des touches personnalisées</string>
+  <string name="pref_extra_keys_internal">Sélectionner les touches à ajouter au clavier</string>
   <string name="pref_second_layout_title">Disposition secondaire</string>
   <string name="pref_second_layout_none">Aucune</string>
   <string name="pref_category_typing">Saisie</string>
@@ -32,16 +35,20 @@
   <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_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <string name="pref_pin_entry_enabled_title">Clavier PIN</string>
+  <string name="pref_pin_entry_enabled_summary">Lors de la saisie de nombres, de dates et de numéros de téléphone</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>
-  <string name="pref_keyboard_height_landscape_title">Hauteur du clavier en mode paysage</string>
   <string name="pref_horizontal_margin_title">Marge des côtés</string>
   <string name="pref_character_size_title">Taille des symboles</string>
   <string name="pref_character_size_summary">Taille des caractères affichés sur les touches (%.2fx)</string>
@@ -50,7 +57,11 @@
   <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_theme_e_desert">Desert</string>
+  <string name="pref_theme_e_jungle">Jungle</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>
@@ -58,13 +69,36 @@
   <string name="pref_swipe_dist_e_very_far">Très longue</string>
   <string name="pref_key_horizontal_space">Espacement horizontal entre les touches</string>
   <string name="pref_key_vertical_space">Espacement vertical entre les touches</string>
-  <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="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_button_imepicker">Selectionner le keyboard</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 Github.</string>
+  <string name="launcher_tryhere">Après l\'avoir activé, vous pouvez l\'essayer ici:</string>
+  <string name="key_descr_capslock">Verrouillage majuscules</string>
+  <string name="key_descr_switch_greekmath">Symboles mathématiques</string>
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <string name="key_descr_voice_typing">Saisie vocale</string>
+  <string name="key_descr_copy">Copier</string>
+  <string name="key_descr_paste">Coller</string>
+  <string name="key_descr_cut">Couper</string>
+  <string name="key_descr_selectAll">Sel. tout</string>
+  <string name="key_descr_shareText">Partager</string>
+  <string name="key_descr_pasteAsPlainText">Copier en texte brut</string>
+  <string name="key_descr_undo">Undo</string>
+  <string name="key_descr_redo">Redo</string>
+  <string name="key_descr_ª">Ordinal</string>
+  <string name="key_descr_º">Ordinal</string>
+  <string name="key_descr_superscript">Exposant</string>
+  <string name="key_descr_subscript">Souscrit</string>
+  <string name="key_descr_page_up">Page précédente</string>
+  <string name="key_descr_page_down">Page suivante</string>
+  <string name="key_descr_home">Début</string>
+  <string name="key_descr_end">Fin</string>
+  <string name="pref_category_advanced">Avancé</string>
 </resources>

res/values-it/strings.xml

@@ -1,30 +1,33 @@
 <?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_release">Unexpected Keyboard</string>
+  <string name="app_name_debug">Unexpected Keyboard (debug)</string>
   <string name="settings_activity_label">Impostazioni di Unexpected Keyboard</string>
+  <!-- <string name="pref_portrait">In portrait mode</string> -->
+  <!-- <string name="pref_landscape">In landscape mode</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_layout_title">Cambia layout tastiera</string>
   <string name="pref_layout_e_system">Impostazioni di sistema</string>
   <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
-  <string name="pref_accents_title">Accenti</string>
-  <string name="pref_accents_e_all_installed">Mostra accenti per tutte le lingue installate</string>
-  <string name="pref_accents_e_selected">Mostra accenti solo per le lingue selezionate</string>
-  <string name="pref_accents_e_none">Nascondi accenti</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
+  <!-- <string name="pref_custom_layout_title">Custom layout</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_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_extra_keys_custom">Add custom keys</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <string name="pref_second_layout_none">Nessuno</string>
   <string name="pref_category_typing">Digitando</string>
@@ -32,16 +35,20 @@
   <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_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</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>
-  <string name="pref_keyboard_height_landscape_title">Altezza tastiera in modalità orizzontale</string>
   <string name="pref_horizontal_margin_title">Margine orizzontale</string>
   <string name="pref_character_size_title">Dimensione Caratteri</string>
   <string name="pref_character_size_summary">Dimensione dei caratteri mostrati sulla tastiera (%.2fx)</string>
@@ -50,7 +57,11 @@
   <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_theme_e_desert">Desert</string> -->
+  <!-- <string name="pref_theme_e_jungle">Jungle</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>
@@ -58,13 +69,36 @@
   <string name="pref_swipe_dist_e_very_far">Molto distante</string>
   <string name="pref_key_horizontal_space">Spazio orizzontale tra i tasti</string>
   <string name="pref_key_vertical_space">Spazio verticale tra i tasti</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="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_button_imepicker">Select 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 Github.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <!-- <string name="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
+  <!-- <string name="pref_category_advanced">Advanced</string> -->
 </resources>

res/values-ko/strings.xml

@@ -1,30 +1,33 @@
 <?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_release">Unexpected Keyboard</string> -->
+  <!-- <string name="app_name_debug">Unexpected Keyboard (Debug)</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_category_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_layout_title">키보드 레이아웃 변경</string>
   <string name="pref_layout_e_system">시스템 세팅</string>
   <!-- <string name="pref_layout_e_custom">Custom layout</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_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
+  <!-- <string name="pref_custom_layout_title">Custom layout</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_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_extra_keys_custom">Add custom keys</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <!-- <string name="pref_second_layout_title">Secondary layout</string> -->
   <!-- <string name="pref_second_layout_none">None</string> -->
   <string name="pref_category_typing">타자</string>
@@ -32,16 +35,20 @@
   <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_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">스타일</string>
   <string name="pref_margin_bottom_title">아래 넓이</string>
   <string name="pref_keyboard_height_title">키보드 높이</string>
-  <!-- <string name="pref_keyboard_height_landscape_title">Keyboard height in landscape mode</string> -->
   <string name="pref_horizontal_margin_title">양 옆 넓이</string>
   <string name="pref_character_size_title">폰트 크기</string>
   <string name="pref_character_size_summary">키보드의 표시되는 폰트 크기 (%.2fx)</string>
@@ -50,7 +57,11 @@
   <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_theme_e_desert">Desert</string> -->
+  <!-- <string name="pref_theme_e_jungle">Jungle</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>
@@ -58,13 +69,36 @@
   <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="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_button_imepicker">Select 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 Github.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <!-- <string name="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
+  <!-- <string name="pref_category_advanced">Advanced</string> -->
 </resources>

res/values-land/dimens.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <dimen name="emoji_type_button_height">48dp</dimen>
-  <dimen name="extra_horizontal_margin">25dp</dimen>
 </resources>

res/values-lv/strings.xml

@@ -1,47 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="app_name" product="debug">Unexpected Keyboard (atkļūdošana)</string>
-  <string name="app_name" product="default">Unexpected Keyboard</string>
+  <string name="app_name_release">Unexpected Keyboard</string>
+  <string name="app_name_debug">Unexpected Keyboard (atkļūdošana)</string>
   <string name="settings_activity_label">Unexpected Keyboard iestatījumi</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_layout_title">Mainīt tastatūras izkārtojumu</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_e_system">Ierīces iestatījumi</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</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>
-  <string name="pref_accents_e_none">Paslēpt uzsvara zīmes</string>
+  <string name="pref_layout_e_custom">Pielāgots izkārtojums</string>
+  <string name="pref_layouts_add">Pievienot aizstājējizkārtojumu</string>
+  <string name="pref_layouts_item">Izkārtojums %1$d: %2$s</string>
+  <string name="pref_layouts_remove_custom">Noņemt izkārtojumu</string>
+  <string name="pref_custom_layout_title">Pielāgots izkārtojums</string>
   <string name="pref_show_numpad_title">Rādīt ciparnīcu</string>
   <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_extra_keys_custom">Pievienot pielāgotus taustiņus</string>
+  <string name="pref_extra_keys_internal">Atlasīt taustiņus, ko pievienot tastatūrai</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_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <string name="pref_pin_entry_enabled_title">Piespraust ievadīšanas izkārtojumu</string>
+  <string name="pref_pin_entry_enabled_summary">Kad ievada skaitļus, datumus un tālruņa numurus</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>
-  <string name="pref_keyboard_height_landscape_title">Tastatūras augstums guleniski</string>
   <string name="pref_horizontal_margin_title">Līmeniskā apmale</string>
   <string name="pref_character_size_title">Iezīmes izmērs</string>
   <string name="pref_character_size_summary">Tastatūrā attēloto rakstzīmju izmērs (%.2fx)</string>
@@ -50,7 +57,11 @@
   <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_theme_e_desert">Tuksnesis</string>
+  <string name="pref_theme_e_jungle">Džungļi</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>
@@ -58,13 +69,38 @@
   <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="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">Iespējot tastatūru</string>
+  <string name="launcher_button_imepicker">Izvēlēties tastatūru</string>
+  <string name="launcher_description">Šī lietotne ir virtuālā tastatūra.
+    Ar zemāk esošo pogu var atvērt sistēmas iestatījumus un iespējot Unexpected Keyboard.</string>
+  <string name="launcher_sourcecode">Šī ir bezmaksas un atvērtā pirmkoda lietotne.
+    GitHub var atrast pirmkodu un ziņot par nepilnībām.</string>
+  <string name="launcher_tryhere">Pēc iespējošanas šeit var izmēģināt tastatūru:</string>
+  <string name="key_descr_capslock">Burtslēgs</string>
+  <string name="key_descr_switch_greekmath">Grieķu un matemātikas rakstzīmes</string>
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <string name="key_descr_voice_typing">Rakstīšana ar balsi</string>
+  <string name="key_descr_copy">Ievietot starpliktuvē</string>
+  <string name="key_descr_paste">Ielīmēt</string>
+  <string name="key_descr_cut">Izgriezt</string>
+  <string name="key_descr_selectAll">Iezīmēt visu</string>
+  <string name="key_descr_shareText">Kopīgot tekstu</string>
+  <string name="key_descr_pasteAsPlainText">Ielīmēt kā vienkāršu tekstu</string>
+  <string name="key_descr_undo">Atsaukt</string>
+  <string name="key_descr_redo">Atatsaukt</string>
+  <string name="key_descr_ª">Kārtas rādītājs</string>
+  <string name="key_descr_º">Kārtas rādītājs</string>
+  <string name="key_descr_superscript">Augšraksts</string>
+  <string name="key_descr_subscript">Apakšraksts</string>
+  <string name="key_descr_page_up">Augšupšķirt</string>
+  <string name="key_descr_page_down">Lejupšķirt</string>
+  <string name="key_descr_home">Sākums</string>
+  <string name="key_descr_end">Beigas</string>
+  <string name="pref_category_advanced">Papildu</string>
 </resources>

res/values-night-v21/styles.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <style name="appTheme" parent="@android:style/Theme.Material"/>
+</resources>

res/values-pl/strings.xml

@@ -1,30 +1,33 @@
 <?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_release">Unexpected Keyboard</string>
+  <string name="app_name_debug">Unexpected Keyboard (debug)</string>
   <string name="settings_activity_label">Ustawienia Unexpected Keyboard</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>
   <string name="pref_key_opacity">Nieprzezroczystość klawisza</string>
   <string name="pref_key_activated_opacity">Nieprzezroczystość naciśniętego klawisza</string>
-  <string name="pref_layout_title">Zmień układ klawiatury</string>
   <string name="pref_layout_e_system">Systemowy</string>
   <string name="pref_layout_e_custom">Własny układ</string>
-  <string name="pref_accents_title">Znaki diakrytyczne</string>
-  <string name="pref_accents_e_all_installed">Pokaż znaki diakryt. dla wszystkich zainstalowanych języków</string>
-  <string name="pref_accents_e_selected">Pokaż znaki diakryt. tylko dla wybranego języka</string>
-  <string name="pref_accents_e_none">Ukryj znaki diakrytyczne</string>
+  <string name="pref_layouts_add">Dodaj dodatkowy układ</string>
+  <string name="pref_layouts_item">Układ %1$d: %2$s</string>
+  <string name="pref_layouts_remove_custom">Usuń układ</string>
+  <string name="pref_custom_layout_title">Własny układ</string>
   <string name="pref_show_numpad_title">Pokaż klawiaturę numeryczną</string>
   <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_extra_keys_custom">Dodaj niestandardowe klawisze</string>
+  <string name="pref_extra_keys_internal">Wybierz klawisze, które chcesz dodać do klawiatury</string>
   <string name="pref_second_layout_title">Drugi układ</string>
   <string name="pref_second_layout_none">Żaden</string>
   <string name="pref_category_typing">Pisanie</string>
@@ -32,16 +35,20 @@
   <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_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <string name="pref_pin_entry_enabled_title">Układ klawiatury PIN</string>
+  <string name="pref_pin_entry_enabled_summary">Podczas wpisywania liczb, dat i numerów telefonu</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>
-  <string name="pref_keyboard_height_landscape_title">Wysokość klawiatury w orientacji poziomej</string>
   <string name="pref_horizontal_margin_title">Margines poziomy</string>
   <string name="pref_character_size_title">Wielkość znaku</string>
   <string name="pref_character_size_summary">Wielkość znaków widocznych na klawiaturze (%.2fx)</string>
@@ -50,7 +57,11 @@
   <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_theme_e_desert">Pustynny</string>
+  <string name="pref_theme_e_jungle">Dżunglowy</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>
@@ -58,13 +69,36 @@
   <string name="pref_swipe_dist_e_very_far">Bardzo duża</string>
   <string name="pref_key_horizontal_space">Odległość pomiędzy klawiszami w poziomie</string>
   <string name="pref_key_vertical_space">Odległość pomiędzy klawiszami w pionie</string>
-  <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="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_button_imepicker">Wybierz 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 Githubie.</string>
+  <string name="launcher_tryhere">Po jej włączeniu, możesz wypróbować klawiaturę tutaj:</string>
+  <string name="key_descr_capslock">Caps lock</string>
+  <string name="key_descr_switch_greekmath">Symbole greckie i matematyczne</string>
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <string name="key_descr_voice_typing">Pisanie głosowe</string>
+  <string name="key_descr_copy">Kopiuj</string>
+  <string name="key_descr_paste">Wklej</string>
+  <string name="key_descr_cut">Wytnij</string>
+  <string name="key_descr_selectAll">Zaznacz wszystko</string>
+  <string name="key_descr_shareText">Udostępnij tekst</string>
+  <string name="key_descr_pasteAsPlainText">Wklej sam tekst</string>
+  <string name="key_descr_undo">Cofnij</string>
+  <string name="key_descr_redo">Ponów</string>
+  <string name="key_descr_ª">Wskaźnik porządkowy (żeński)</string>
+  <string name="key_descr_º">Wskaźnik porządkowy (męski)</string>
+  <string name="key_descr_superscript">Indeks górny</string>
+  <string name="key_descr_subscript">Indeks dolny</string>
+  <string name="key_descr_page_up">Page Up</string>
+  <string name="key_descr_page_down">Page Down</string>
+  <string name="key_descr_home">Home</string>
+  <string name="key_descr_end">End</string>
+  <string name="pref_category_advanced">Zaawansowane</string>
 </resources>

res/values-pt/strings.xml

@@ -1,47 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="app_name_release">Teclado Unexpected</string>
+  <string name="app_name_debug">Teclado Unexpected</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_layout_title">Mudar layout do teclado</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_e_system">Mesmo do sistema</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</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_layout_e_custom">Layout personalizado</string>
+  <string name="pref_layouts_add">Adicione um layout alternativo</string>
+  <string name="pref_layouts_item">Layout %1$d: %2$s</string>
+  <string name="pref_layouts_remove_custom">Remover layout</string>
+  <string name="pref_custom_layout_title">Layout personalizado</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_extra_keys_custom">Adicionar teclas customizadas</string>
+  <string name="pref_extra_keys_internal">Selecione teclas para serem adicionadas 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_title">Tecle duas vezes no shift para travá-lo acionado</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_custom">Vibração personalizada</string>
+  <string name="pref_vibrate_duration_title">Intensidade da vibração</string>
+  <string name="pref_pin_entry_enabled_title">Layout PIN</string>
+  <string name="pref_pin_entry_enabled_summary">Quando digitando números, datas ou números de telefone</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>
-  <string name="pref_keyboard_height_landscape_title">Altura do teclado em modo paisagem</string>
   <string name="pref_horizontal_margin_title">Margem horizontal</string>
   <string name="pref_character_size_title">Tamanho dos indicadores</string>
   <string name="pref_character_size_summary">Tamanho dos caracteres visíveis no teclado (%.2fx)</string>
@@ -50,21 +57,48 @@
   <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_swipe_dist_e_very_short">Muito curto</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_theme_e_desert">Deserto</string>
+  <string name="pref_theme_e_jungle">Selva</string>
+  <string name="pref_swipe_dist_e_very_short">Bem curto</string>
   <string name="pref_swipe_dist_e_short">Curto</string>
   <string name="pref_swipe_dist_e_default">Normal</string>
   <string name="pref_swipe_dist_e_far">Longo</string>
-  <string name="pref_swipe_dist_e_very_far">Muito longo</string>
+  <string name="pref_swipe_dist_e_very_far">Bem 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="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_button_imepicker">Selecionar 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 Github.</string>
+  <string name="launcher_tryhere">Após ativar, experimente aqui:</string>
+  <string name="key_descr_capslock">Caps lock</string>
+  <string name="key_descr_switch_greekmath">Grego &amp; símbolos matemáticos</string>
+  <string name="key_descr_change_method">Trocar de teclado</string>
+  <string name="key_descr_voice_typing">Digitação por voz</string>
+  <string name="key_descr_copy">Copiar</string>
+  <string name="key_descr_paste">Colar</string>
+  <string name="key_descr_cut">Recortar</string>
+  <string name="key_descr_selectAll">Selecionar tudo</string>
+  <string name="key_descr_shareText">Compartilhar texto</string>
+  <string name="key_descr_pasteAsPlainText">Colar texto não formatado</string>
+  <string name="key_descr_undo">Desfazer</string>
+  <string name="key_descr_redo">Refazer</string>
+  <string name="key_descr_ª">Indicador Ordinal</string>
+  <string name="key_descr_º">Indicador Ordinal</string>
+  <string name="key_descr_superscript">Sobrescrito</string>
+  <string name="key_descr_subscript">Subscrito</string>
+  <!-- <string name="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
+  <string name="pref_category_advanced">Avançado</string>
 </resources>

res/values-ro/strings.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name_release">Tastatură Unexpected</string>
+  <string name="app_name_debug">Tastatură Unexpected (depanare)</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_e_system">Setări de Sistem</string>
+  <string name="pref_layout_e_custom">Aranjament personalizat</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
+  <string name="pref_custom_layout_title">Aranjament personalizat</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_extra_keys_custom">Add custom keys</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</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_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</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_theme_e_desert">Desert</string> -->
+  <!-- <string name="pref_theme_e_jungle">Jungle</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="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_button_imepicker">Select keyboard</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 Github.</string>
+  <string name="launcher_tryhere">După activare, puteți să încercați tastatura aici:</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <!-- <string name="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
+  <string name="pref_category_advanced">Setări avansate</string>
+</resources>

res/values-ru/strings.xml

@@ -1,70 +1,104 @@
 <?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_release">Unexpected Keyboard</string>
+  <string name="app_name_debug">Unexpected Keyboard (отладка)</string>
   <string name="settings_activity_label">Unexpected Keyboard Настройки</string>
+  <string name="pref_portrait">В портретном режиме</string>
+  <string name="pref_landscape">В ландшафтном режиме</string>
   <string name="pref_category_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_layout_title">Изменить раскладку клавиатуры</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_e_system">Системные настройки</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</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">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">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">Нету</string>
-  <string name="pref_category_typing">Печатание</string>
+  <string name="pref_layout_e_custom">Пользовательская раскладка</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
+  <string name="pref_custom_layout_title">Пользовательская раскладка</string>
+  <string name="pref_show_numpad_title">Показывать NumPad</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">Добавить ряд цифр над клавиатурой, когда 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_extra_keys_title">Добавить клавиши на клавиатуру</string>
+  <!-- <string name="pref_extra_keys_custom">Add custom keys</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</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_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_long_timeout_title">Тайм-аут повтора клавиш</string>
+  <string name="pref_long_interval_title">Интервал повтора клавиш</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_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">Стиль</string>
   <string name="pref_margin_bottom_title">Нижняя граница поля</string>
   <string name="pref_keyboard_height_title">Высота клавиатуры</string>
-  <string name="pref_keyboard_height_landscape_title">Высота клавиатуры в ландшафтном режиме</string>
   <string name="pref_horizontal_margin_title">Горизонтальное поле</string>
-  <string name="pref_character_size_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_white">White</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">Far</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">ePaper</string>
+  <!-- <string name="pref_theme_e_desert">Desert</string> -->
+  <!-- <string name="pref_theme_e_jungle">Jungle</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">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="key_action_next">Next</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_button_imepicker">Select keyboard</string> -->
+  <string name="launcher_description">Данное приложение является виртуальной клавиатурой. Зайдите в настройки, нажав кнопку внизу и активируйте Unexpected-Keyboard.</string>
+  <string name="launcher_sourcecode">Это бесплатное приложение с открытым исходным кодом. Вы можете изучить код или сообщить об ошибках по ссылке Github.</string>
+  <string name="launcher_tryhere">После активации вы можете попробовать клавиатуру прямо здесь:</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <!-- <string name="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
+  <string name="pref_category_advanced">Расширенные настройки</string>
 </resources>

res/values-tr/strings.xml

@@ -1,56 +1,67 @@
 <?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_release">Unexpected Keyboard</string>
+  <string name="app_name_debug">Unexpected Keyboard (debug)</string>
   <string name="settings_activity_label">Unexpected Keyboard Ayarları</string>
-  <string name="pref_category_layout">Düzen</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_layout_title">Klavye Düzenini Değiştir</string>
-  <string name="pref_layout_e_system">Sistem Ayarları</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</string> -->
-  <string name="pref_accents_title">Aksanlar</string>
-  <string name="pref_accents_e_all_installed">Yüklü tüm dillerin aksanlarını göster</string>
-  <string name="pref_accents_e_selected">Sadece seçili dilin aksanlarını göster</string>
-  <string name="pref_accents_e_none">Aksanları gizle</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">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_portrait">Portre modunda</string>
+  <string name="pref_landscape">Manzara modunda</string>
+  <string name="pref_category_layout">Tuş düzeni</string>
+  <string name="pref_label_brightness">Adjust label brightness</string>
+  <string name="pref_keyboard_opacity">Klavye arkaplanı opaklığını ayarla</string>
+  <string name="pref_key_opacity">Tuş opaklığını ayarla</string>
+  <string name="pref_key_activated_opacity">Tuşa basıldığındaki opaklığı ayarla</string>
+  <string name="pref_layout_e_system">Sistem ayarlarını kullan</string>
+  <string name="pref_layout_e_custom">Özel tuş düeni</string>
+  <string name="pref_layouts_add">Alternatif bir tuş düzeni ekle</string>
+  <string name="pref_layouts_item">Tuş düzeni %1$d: %2$s</string>
+  <string name="pref_layouts_remove_custom">Tuş düzenini kaldır</string>
+  <string name="pref_custom_layout_title">Özel tuş düzeni</string>
+  <string name="pref_show_numpad_title">NumPadi göster</string>
+  <string name="pref_show_numpad_never">Asla</string>
+  <string name="pref_show_numpad_landscape">Sadece manzara modunda</string>
+  <string name="pref_show_numpad_always">Her zaman</string>
+  <string name="pref_number_row_title">Rakam satırını göster</string>
+  <string name="pref_number_row_summary">NumPad gizlendiğinde klavyenin üstüne rakam satırı ekle</string>
+  <string name="pref_numpad_layout">NumPad düzeni</string>
+  <string name="pref_numpad_layout_e_high_first">9dan 1e</string>
+  <string name="pref_numpad_layout_e_low_first">1den 9a</string>
+  <string name="pref_extra_keys_title">Tuş ekle</string>
+  <string name="pref_extra_keys_custom">Özel tuş ekle</string>
+  <string name="pref_extra_keys_internal">Klavyeye eklenecek tuşları seçin</string>
+  <string name="pref_second_layout_title">İklncil tuş düzeni</string>
   <string name="pref_second_layout_none">Hiçbiri</string>
   <string name="pref_category_typing">Yazma</string>
   <string name="pref_swipe_dist_title">Kaydırma mesafesi</string>
-  <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_style">Stil</string>
+  <string name="pref_swipe_dist_summary">Tuşların köşelerinden kaydırma mesafesi (%s)</string>
+  <string name="pref_long_timeout_title">Tuşların tekrarlaması için geçmesi gereken süre</string>
+  <string name="pref_long_interval_title">Tuşların tekrarlama sıklığı</string>
+  <string name="pref_lock_double_tap_title">CapsLock için Shift tuşuna çift bas</string>
+  <string name="pref_lock_double_tap_summary">Uzun basarak CapsLock açılabilir</string>
+  <string name="pref_category_behavior">Klavye davranışı</string>
+  <string name="pref_autocapitalisation_title">Otomatik büyük harf</string>
+  <string name="pref_autocapitalisation_summary">Noktadan sonra ve her cümlenin başında büyük harf yapar</string>
+  <string name="pref_switch_input_immediate_title">Son kullanılan klavyeye geç</string>
+  <string name="pref_switch_input_immediate_summary">Klavye değistirme tuşunun davranışını belirler</string>
+  <!-- <string name="pref_vibrate_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <string name="pref_pin_entry_enabled_title">NumPad</string>
+  <string name="pref_pin_entry_enabled_summary">Sayıları, tarihleri ve telefon numaralarını yazarken</string>
+  <string name="pref_category_style">Tarz</string>
   <string name="pref_margin_bottom_title">Alt boşluk</string>
   <string name="pref_keyboard_height_title">Klavye yüksekliği</string>
-  <!-- <string name="pref_keyboard_height_landscape_title">Keyboard height in landscape mode</string> -->
   <string name="pref_horizontal_margin_title">Yatay boşluk</string>
   <string name="pref_character_size_title">Etiket boyutu</string>
-  <string name="pref_character_size_summary">Klavye üzerinde gösterilecek karakter boyutu (%.2fx)</string>
+  <string name="pref_character_size_summary">Klavye üzerindeki karakterlerin boyutu (%.2fx)</string>
   <string name="pref_theme">Tema</string>
-  <string name="pref_theme_e_system">Sistem Ayarları</string>
+  <string name="pref_theme_e_system">Sistem Temasını Kullan</string>
   <string name="pref_theme_e_dark">Koyu</string>
-  <string name="pref_theme_e_light">Açık</string>
+  <string name="pref_theme_e_light">Aydınlık</string>
   <string name="pref_theme_e_black">Siyah</string>
-  <!-- <string name="pref_theme_e_white">White</string> -->
+  <string name="pref_theme_e_altblack">Alternatif Siyah</string>
+  <string name="pref_theme_e_white">Beyaz</string>
+  <string name="pref_theme_e_epaper">E-Kağıt</string>
+  <string name="pref_theme_e_desert">Çöl</string>
+  <string name="pref_theme_e_jungle">Orman</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>
@@ -58,13 +69,36 @@
   <string name="pref_swipe_dist_e_very_far">Çok uzun</string>
   <string name="pref_key_horizontal_space">Tuşlar arasındaki yatay boşluk</string>
   <string name="pref_key_vertical_space">Tuşlar arasındaki dikey boşluk</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="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_next">Sonraki</string>
+  <string name="key_action_done">Tamam</string>
+  <string name="key_action_go">ileri</string>
+  <string name="key_action_prev">Önceki</string>
   <string name="key_action_search">Ara</string>
   <string name="key_action_send">Gönder</string>
+  <string name="launcher_button_imesettings">Ayarlarda aktif et</string>
+  <string name="launcher_button_imepicker">Klavye Seç</string>
+  <string name="launcher_description">Bu uygulama bir sanal klavye uygulamasıdır. Aşağıdaki butona basarak sistem ayarlarında etkinleştiriniz.</string>
+  <string name="launcher_sourcecode">Bu uygulama ücretsiz ve açık kaynaklıdır. Kaynak koduna erişmek veya bir hata raporlamak için GitHub</string>
+  <string name="launcher_tryhere">Ayarlardan aktif ettikten sonra klavyeyi burada test edebilirsin:</string>
+  <string name="key_descr_capslock">CapsLock</string>
+  <string name="key_descr_switch_greekmath">Greek &amp; math sembolleri</string>
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <string name="key_descr_voice_typing">Sesle yazma</string>
+  <string name="key_descr_copy">Kopyala</string>
+  <string name="key_descr_paste">Yapıştır</string>
+  <string name="key_descr_cut">Kes</string>
+  <string name="key_descr_selectAll">Tümünü seç</string>
+  <string name="key_descr_shareText">Metni paylaş</string>
+  <string name="key_descr_pasteAsPlainText">Düz metin olarak yapıştır</string>
+  <string name="key_descr_undo">Geri al</string>
+  <string name="key_descr_redo">İleri al</string>
+  <string name="key_descr_ª">Sıralı göstergesi</string>
+  <string name="key_descr_º">Sıralı göstergesi</string>
+  <string name="key_descr_superscript">Süperscript</string>
+  <string name="key_descr_subscript">Anascript</string>
+  <string name="key_descr_page_up">Yukarı</string>
+  <string name="key_descr_page_down">Aşağı</string>
+  <string name="key_descr_home">BAŞ(Sol yön tuşu)</string>
+  <string name="key_descr_end">SON(Sağ yön tuşu)</string>
+  <string name="pref_category_advanced">Gelişmiş</string>
 </resources>

res/values-uk/strings.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name_release">Unexpected Keyboard</string>
+  <string name="app_name_debug">Unexpected Keyboard (Налагодження)</string>
+  <string name="settings_activity_label">Unexpected Keyboard Налаштування</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_e_system">Системні налаштування</string>
+  <string name="pref_layout_e_custom">Власний макет</string>
+  <string name="pref_layouts_add">Додати альтернативний макет</string>
+  <string name="pref_layouts_item">Макет %1$d: %2$s</string>
+  <string name="pref_layouts_remove_custom">Видалити макет</string>
+  <string name="pref_custom_layout_title">Власний макет</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_extra_keys_custom">Додайте власні клавіші</string>
+  <string name="pref_extra_keys_internal">Виберіть клавіші, які потрібно додати до клавіатури</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">Двічі торкніться 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_custom">Спеціальна вібрація</string>
+  <string name="pref_vibrate_duration_title">Інтенсивність вібрації</string>
+  <string name="pref_pin_entry_enabled_title">Макет введення PIN-коду</string>
+  <string name="pref_pin_entry_enabled_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">ePaper</string>
+  <string name="pref_theme_e_desert">Пустеля</string>
+  <string name="pref_theme_e_jungle">Джунглі</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="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_button_imepicker">Вибрати клавіатуру</string>
+  <string name="launcher_description">Ця програма є віртуальною клавіатурою. Перейдіть до системних налаштувань, натиснувши кнопку нижче, і ввімкніть Unexpected-Keyboard.</string>
+  <string name="launcher_sourcecode">Це безкоштовна програма з відкритим кодом. Ви можете знайти початковий код або повідомити про помилки на GitHub.</string>
+  <string name="launcher_tryhere">Після ввімкнення ви можете спробувати клавіатуру тут:</string>
+  <string name="key_descr_capslock">Caps lock</string>
+  <string name="key_descr_switch_greekmath">Грецькі та математичні символи</string>
+  <string name="key_descr_change_method">Переключити клавіатуру</string>
+  <string name="key_descr_voice_typing">Голосове введення</string>
+  <string name="key_descr_copy">Копіювати</string>
+  <string name="key_descr_paste">Вставити</string>
+  <string name="key_descr_cut">Вирізати</string>
+  <string name="key_descr_selectAll">Вибрати все</string>
+  <string name="key_descr_shareText">Поділитися текстом</string>
+  <string name="key_descr_pasteAsPlainText">Вставити як звичайний текст</string>
+  <string name="key_descr_undo">Відмінити</string>
+  <string name="key_descr_redo">Повторити</string>
+  <string name="key_descr_ª">Жіночий порядковий вказівник</string>
+  <string name="key_descr_º">Чоловічий порядковий вказівник</string>
+  <string name="key_descr_superscript">Верхній індекс</string>
+  <string name="key_descr_subscript">Нижній індекс</string>
+  <string name="key_descr_page_up">Page Up</string>
+  <string name="key_descr_page_down">Page Down</string>
+  <string name="key_descr_home">Home</string>
+  <string name="key_descr_end">End</string>
+  <string name="pref_category_advanced">Додаткові</string>
+</resources>

res/values-v21/styles.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <style name="appTheme" parent="@android:style/Theme.Material.Light"/>
+</resources>

res/values-vi/strings.xml

@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name_release">Unexpected Keyboard</string>
+  <string name="app_name_debug">Unexpected Keyboard (gỡ lỗi)</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_e_system">Hệ thống</string>
+  <string name="pref_layout_e_custom">Tùy chỉnh bố cục</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
+  <string name="pref_custom_layout_title">Tùy chỉnh bố cục</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_extra_keys_custom">Add custom keys</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</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_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</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_theme_e_desert">Desert</string> -->
+  <!-- <string name="pref_theme_e_jungle">Jungle</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="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_button_imepicker">Select 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 Github.</string> -->
+  <!-- <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string> -->
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <!-- <string name="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
+  <string name="pref_category_advanced">Nâng cao</string>
+</resources>

res/values-zh-rCN/strings.xml

@@ -1,30 +1,33 @@
 <?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_release">Unexpected Keyboard</string>
+  <string name="app_name_debug">Unexpected Keyboard (debug)</string>
   <string name="settings_activity_label">Unexpected Keyboard 设置</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_layout_title">改变键盘布局</string>
+  <string name="pref_keyboard_opacity">调整键盘背景透明度</string>
+  <string name="pref_key_opacity">调整按键透明度</string>
+  <string name="pref_key_activated_opacity">调整按下的按键的透明度</string>
   <string name="pref_layout_e_system">系统设置</string>
-  <!-- <string name="pref_layout_e_custom">Custom layout</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_layout_e_custom">自定义布局</string>
+  <!-- <string name="pref_layouts_add">Add an alternate layout</string> -->
+  <!-- <string name="pref_layouts_item">Layout %1$d: %2$s</string> -->
+  <!-- <string name="pref_layouts_remove_custom">Remove layout</string> -->
+  <string name="pref_custom_layout_title">自定义布局</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_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_extra_keys_custom">Add custom keys</string> -->
+  <!-- <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string> -->
   <string name="pref_second_layout_title">第二键盘布局</string>
   <string name="pref_second_layout_none">无</string>
   <string name="pref_category_typing">输入</string>
@@ -32,16 +35,20 @@
   <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_custom">Custom vibration</string> -->
+  <!-- <string name="pref_vibrate_duration_title">Vibration intensity</string> -->
+  <!-- <string name="pref_pin_entry_enabled_title">Pin entry layout</string> -->
+  <!-- <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</string> -->
   <string name="pref_category_style">样式</string>
   <string name="pref_margin_bottom_title">键盘下边距</string>
   <string name="pref_keyboard_height_title">键盘高度</string>
-  <string name="pref_keyboard_height_landscape_title">键盘高度（横屏模式）</string>
   <string name="pref_horizontal_margin_title">键盘左右边距</string>
   <string name="pref_character_size_title">字符大小</string>
   <string name="pref_character_size_summary">按键上显示的字符的大小 (%.2fx)</string>
@@ -50,7 +57,11 @@
   <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_theme_e_desert">Desert</string> -->
+  <!-- <string name="pref_theme_e_jungle">Jungle</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>
@@ -58,13 +69,36 @@
   <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="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_button_imepicker">Select keyboard</string> -->
+  <string name="launcher_description">这是一个虚拟键盘软件。点击按钮进入系统设置，然后启用 Unexpected-Keyboard 即可使用。</string>
+  <string name="launcher_sourcecode">这是一个免费且开源的软件。你可以在 Github 上找到源代码或者反馈 bug。</string>
+  <string name="launcher_tryhere">启用键盘后，可以在这里测试效果：</string>
+  <!-- <string name="key_descr_capslock">Caps lock</string> -->
+  <!-- <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string> -->
+  <!-- <string name="key_descr_change_method">Switch keyboard</string> -->
+  <!-- <string name="key_descr_voice_typing">Voice typing</string> -->
+  <!-- <string name="key_descr_copy">Copy</string> -->
+  <!-- <string name="key_descr_paste">Paste</string> -->
+  <!-- <string name="key_descr_cut">Cut</string> -->
+  <!-- <string name="key_descr_selectAll">Select all</string> -->
+  <!-- <string name="key_descr_shareText">Share text</string> -->
+  <!-- <string name="key_descr_pasteAsPlainText">Paste as plain text</string> -->
+  <!-- <string name="key_descr_undo">Undo</string> -->
+  <!-- <string name="key_descr_redo">Redo</string> -->
+  <!-- <string name="key_descr_ª">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_º">Ordinal Indicator</string> -->
+  <!-- <string name="key_descr_superscript">Superscript</string> -->
+  <!-- <string name="key_descr_subscript">Subscript</string> -->
+  <!-- <string name="key_descr_page_up">Page Up</string> -->
+  <!-- <string name="key_descr_page_down">Page Down</string> -->
+  <!-- <string name="key_descr_home">Home</string> -->
+  <!-- <string name="key_descr_end">End</string> -->
+  <string name="pref_category_advanced">高级设置</string>
 </resources>

res/values/arrays.xml

@@ -1,68 +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>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>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>
-    <item>@string/pref_accents_e_none</item>
-  </string-array>
   <string-array name="pref_show_numpad_values">
     <item>never</item>
     <item>landscape</item>
@@ -81,24 +18,27 @@
     <item>@string/pref_numpad_layout_e_high_first</item>
     <item>@string/pref_numpad_layout_e_low_first</item>
   </string-array>
-  <string-array name="pref_accents_values">
-    <item>1</item>
-    <item>2</item>
-    <item>4</item>
-  </string-array>
   <string-array name="pref_theme_entries">
     <item>@string/pref_theme_e_system</item>
     <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>
+    <item>@string/pref_theme_e_desert</item>
+    <item>@string/pref_theme_e_jungle</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>
+    <item>desert</item>
+    <item>jungle</item>
   </string-array>
   <string-array name="pref_swipe_dist_entries">
     <item>@string/pref_swipe_dist_e_very_short</item>

res/values/attrs.xml

@@ -3,7 +3,4 @@
   <declare-styleable name="ExtraKeyCheckBoxPreference">
     <attr name="index" format="integer"/>
   </declare-styleable>
-  <declare-styleable name="LayoutListPreference">
-    <attr name="defaultString" format="string"/>
-  </declare-styleable>
 </resources>

res/values/layouts.xml

@@ -0,0 +1,154 @@
+<?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>system</item>
+    <item>latn_qwerty_us</item>
+    <item>latn_colemak</item>
+    <item>latn_dvorak</item>
+    <item>arab_alt</item>
+    <item>arab_hamvaj_tly</item>
+    <item>arab_pc</item>
+    <item>arab_pc_ckb</item>
+    <item>arab_pc_hindu</item>
+    <item>arab_pc_ir</item>
+    <item>armenian_ph_am</item>
+    <item>beng_national</item>
+    <item>beng_provat</item>
+    <item>cyrl_jcuken_ru</item>
+    <item>cyrl_jcuken_uk</item>
+    <item>cyrl_ueishsht</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_bepo_fr</item>
+    <item>latn_bone</item>
+    <item>latn_neo2</item>
+    <item>latn_qwerty_br</item>
+    <item>latn_qwerty_cz</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_tly</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_fr_ch</item>
+    <item>latn_qwertz_hu</item>
+    <item>latn_qwertz_sk</item>
+    <item>urdu_phonetic_ur</item>
+    <item>custom</item>
+  </string-array>
+  <string-array name="pref_layout_entries">
+    <item>@string/pref_layout_e_system</item>
+    <item>QWERTY (US)</item>
+    <item>Colemak</item>
+    <item>Dvorak</item>
+    <item>Arabic Alt</item>
+    <item>Talysh (تالشی همواج)</item>
+    <item>Arabic PC</item>
+    <item>Kurdish (کوردی)</item>
+    <item>Arabic PC (Hindu numerals)</item>
+    <item>Persian PC</item>
+    <item>Armenian</item>
+    <item>বাংলা (জাতীয়)</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>BEPO (Français)</item>
+    <item>Bone</item>
+    <item>Neo 2</item>
+    <item>QWERTY (Brasileiro)</item>
+    <item>QWERTY (Czech)</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 (Talysh New Latin)</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 (Swiss French)</item>
+    <item>QWERTZ (Magyar)</item>
+    <item>QWERTZ (Slovak)</item>
+    <item>Urdu Phonetic</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_hamvaj_tly</item>
+    <item>@xml/arab_pc</item>
+    <item>@xml/arab_pc_ckb</item>
+    <item>@xml/arab_pc_hindu</item>
+    <item>@xml/arab_pc_ir</item>
+    <item>@xml/armenian_ph_am</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_ueishsht</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_bepo_fr</item>
+    <item>@xml/latn_bone</item>
+    <item>@xml/latn_neo2</item>
+    <item>@xml/latn_qwerty_br</item>
+    <item>@xml/latn_qwerty_cz</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_tly</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_fr_ch</item>
+    <item>@xml/latn_qwertz_hu</item>
+    <item>@xml/latn_qwertz_sk</item>
+    <item>@xml/urdu_phonetic_ur</item>
+    <item>-1</item>
+  </integer-array>
+</resources>

res/values/strings.xml

@@ -1,30 +1,33 @@
 <?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_release">Unexpected Keyboard</string>
+  <string name="app_name_debug">Unexpected Keyboard (Debug)</string>
   <string name="settings_activity_label">Unexpected Keyboard Settings</string>
+  <string name="pref_portrait">In portrait mode</string>
+  <string name="pref_landscape">In landscape mode</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_layout_title">Change keyboard layout</string>
   <string name="pref_layout_e_system">System settings</string>
   <string name="pref_layout_e_custom">Custom layout</string>
-  <string name="pref_accents_title">Accents</string>
-  <string name="pref_accents_e_all_installed">Show accents for all installed languages</string>
-  <string name="pref_accents_e_selected">Only show accents for the selected language</string>
-  <string name="pref_accents_e_none">Hide accents</string>
+  <string name="pref_layouts_add">Add an alternate layout</string>
+  <string name="pref_layouts_item">Layout %1$d: %2$s</string>
+  <string name="pref_layouts_remove_custom">Remove layout</string>
+  <string name="pref_custom_layout_title">Custom layout</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_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_extra_keys_custom">Add custom keys</string>
+  <string name="pref_extra_keys_internal">Select keys to add to the keyboard</string>
   <string name="pref_second_layout_title">Secondary layout</string>
   <string name="pref_second_layout_none">None</string>
   <string name="pref_category_typing">Typing</string>
@@ -32,16 +35,20 @@
   <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_custom">Custom vibration</string>
+  <string name="pref_vibrate_duration_title">Vibration intensity</string>
+  <string name="pref_pin_entry_enabled_title">Pin entry layout</string>
+  <string name="pref_pin_entry_enabled_summary">When typing numbers, dates and phone numbers</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>
-  <string name="pref_keyboard_height_landscape_title">Keyboard height in landscape mode</string>
   <string name="pref_horizontal_margin_title">Horizontal margin</string>
   <string name="pref_character_size_title">Label size</string>
   <string name="pref_character_size_summary">Size of characters displayed on the keyboard (%.2fx)</string>
@@ -50,7 +57,11 @@
   <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_theme_e_desert">Desert</string>
+  <string name="pref_theme_e_jungle">Jungle</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>
@@ -58,13 +69,37 @@
   <string name="pref_swipe_dist_e_very_far">Very far</string>
   <string name="pref_key_horizontal_space">Horizontal spacing between the keys</string>
   <string name="pref_key_vertical_space">Vertical spacing between the keys</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="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_button_imepicker">Select 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 Github.</string>
+  <string name="launcher_tryhere">After enabling, you can try the keyboard here:</string>
+  <string name="key_descr_capslock">Caps lock</string>
+  <string name="key_descr_switch_greekmath">Greek &amp; math symbols</string>
+  <string name="key_descr_change_method">Switch keyboard</string>
+  <string name="key_descr_voice_typing">Voice typing</string>
+  <string name="key_descr_copy">Copy</string>
+  <string name="key_descr_paste">Paste</string>
+  <string name="key_descr_cut">Cut</string>
+  <string name="key_descr_selectAll">Select all</string>
+  <string name="key_descr_shareText">Share text</string>
+  <string name="key_descr_pasteAsPlainText">Paste as plain text</string>
+  <string name="key_descr_undo">Undo</string>
+  <string name="key_descr_redo">Redo</string>
+  <string name="key_descr_ª">Ordinal Indicator</string>
+  <string name="key_descr_º">Ordinal Indicator</string>
+  <string name="key_descr_superscript">Superscript</string>
+  <string name="key_descr_subscript">Subscript</string>
+  <string name="key_descr_page_up">Page Up</string>
+  <string name="key_descr_page_down">Page Down</string>
+  <string name="key_descr_home">Home</string>
+  <string name="key_descr_end">End</string>
+  <!-- Unused -->
+  <string name="pref_category_advanced">Advanced</string>
 </resources>

res/values/styles.xml

@@ -8,15 +8,6 @@
     <item name="android:textColor">?attr/emoji_key_text</item>
     <item name="android:textSize">18dp</item>
   </style>
-  <style name="emojiKeyButton">
-    <item name="android:layout_width">0px</item>
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_weight">1</item>
-    <item name="android:padding">0px</item>
-    <item name="android:background">?attr/emoji_key_bg</item>
-    <item name="android:textColor">?attr/emoji_key_text</item>
-    <item name="android:textSize">18dp</item>
-  </style>
   <style name="emojiGridButton">
     <item name="android:layout_width">fill_parent</item>
     <item name="android:layout_height">fill_parent</item>
@@ -24,4 +15,12 @@
     <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>
+  <style name="appTheme" parent="@android:style/Theme.DeviceDefault.DayNight"/>
 </resources>

res/values/themes.xml

@@ -81,7 +81,7 @@
     <item name="colorKeyboard">#000000</item>
     <item name="colorKey">#000000</item>
     <item name="colorKeyActivated">#333333</item>
-    <item name="keyBorderWidth">1dp</item>
+    <item name="keyBorderWidth">0dp</item>
     <item name="keyBorderWidthActivated">1dp</item>
     <item name="keyBorderColorLeft">#2a2a2a</item>
     <item name="keyBorderColorTop">#2a2a2a</item>
@@ -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,61 @@
     <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>
+  <style name="Desert" parent="@style/BaseTheme">
+    <item name="android:isLightTheme">true</item>
+    <item name="colorKeyboard">#ffe0b2</item>
+    <item name="colorKey">#fff3e0</item>
+    <item name="colorKeyActivated">#ffcc80</item>
+    <item name="colorLabel">#000000</item>
+    <item name="colorLabelActivated">#ffffff</item>
+    <item name="colorLabelLocked">#e65100</item>
+    <item name="secondaryLightOffset">0.1</item>
+    <item name="colorSubLabel">#333333</item>
+    <item name="keyBorderWidth">0.0dip</item>
+    <item name="keyBorderWidthActivated">0.0dip</item>
+    <item name="keyBorderColorLeft">#000000</item>
+    <item name="keyBorderColorTop">#000000</item>
+    <item name="keyBorderColorRight">#000000</item>
+    <item name="keyBorderColorBottom">#000000</item>
+    <item name="emoji_button_bg">?colorKeyActivated</item>
+    <item name="emoji_color">#000000</item>
+  </style>
+  <style name="Jungle" parent="@style/BaseTheme">
+    <item name="android:isLightTheme">true</item>
+    <item name="colorKeyboard">#4db6ac</item>
+    <item name="colorKey">#e0f2f1</item>
+    <item name="colorKeyActivated">#00695c</item>
+    <item name="colorLabel">#000000</item>
+    <item name="colorLabelActivated">#ffffff</item>
+    <item name="colorLabelLocked">#64ffda</item>
+    <item name="secondaryLightOffset">0.0</item>
+    <item name="colorSubLabel">#004d40</item>
+    <item name="keyBorderWidth">0.0dip</item>
+    <item name="keyBorderWidthActivated">0.0dip</item>
+    <item name="keyBorderColorLeft">#00f0f0f0</item>
+    <item name="keyBorderColorTop">#00f0f0f0</item>
+    <item name="keyBorderColorRight">#00eeeeee</item>
+    <item name="keyBorderColorBottom">#00eeeeee</item>
+    <item name="emoji_button_bg">?colorKeyActivated</item>
+    <item name="emoji_color">#000000</item>
+  </style>
 </resources>

res/values/values.xml

@@ -1,16 +1,10 @@
 <?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="key_height">51dp</dimen>
   <dimen name="emoji_type_button_height">56dp</dimen>
   <dimen name="emoji_grid_height">250dp</dimen>
   <dimen name="emoji_text_size">28dp</dimen>
-  <dimen name="extra_horizontal_margin">0dp</dimen>
-  <bool name="debug_logs" product="debug">true</bool>
-  <bool name="debug_logs" product="default">false</bool>
+  <dimen name="pref_button_size">28dp</dimen>
+  <bool name="debug_logs">false</bool> <!-- Will be overwritten automatically by Gradle for the debug build variant -->
 </resources>

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="loc change_method" key3="switch_emoji" key4="config"/>
+  <key width="4.4" key0="space" key7="switch_forward" key8="switch_backward" key5="cursor_left" key6="cursor_right" slider="true"/>
+  <key width="1.1" key7="up" key6="right" key5="left" key8="down" key1="loc home" key2="loc page_up" key3="loc end" key4="loc page_down"/>
+  <key width="1.7" key0="enter" key1="loc voice_typing" key2="action"/>
 </row>

res/xml/emoji_bottom_row.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- The bottom row used in the emoji pane. -->
+<keyboard bottom_row="false">
+  <row height="0.95">
+    <key key0="switch_back_emoji"/>
+    <key width="4" key0="space" key5="cursor_left" key6="cursor_right" slider="true"/>
+    <key key0="backspace"/>
+    <key key0="enter"/>
+  </row>
+</keyboard>

res/xml/greekmath.xml

@@ -1,38 +1,38 @@
 <?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="⊂"/>
-    <key key0="ϛ" key1="⌋" key2="∧" key3="↑" key4="⊃"/>
-    <key key0="α" key1="⌈" key2="⊥" key3="↕" key4="∀"/>
-    <key key0="ξ" key1="⌉" key2="∡" key4="⊷"/>
-    <key key0="π" key1="∥" key3="≪" key4="7"/>
-    <key key0="ψ" key1="⌀" key2="⟨" key3="≡" key4="8"/>
-    <key key0="λ" key1="∞" key2="⟩" key3="≫" key4="9"/>
-    <key key0="μ" key1="∝" key3="□" key4="f11_placeholder"/>
-    <key key0="ω" key1="∅" key3="∘" key4="f12_placeholder"/>
+    <key key0="ω" key1="⌊" key2="∨" key3="↔" key4="⊂"/>
+    <key key0="ε" key1="⌋" key2="∧" key3="↑" key4="⊃"/>
+    <key key0="ρ" key1="⌈" key2="⊥" key3="↕" key4="∀"/>
+    <key key0="τ" key1="⌉" key2="∡" key4="⊷"/>
+    <key key0="ψ" key1="∥" key3="≪" key4="7"/>
+    <key key0="υ" key1="⌀" key2="⟨" key3="≡" key4="8"/>
+    <key key0="ι" key1="∞" key2="⟩" key3="≫" key4="9"/>
+    <key key0="ο" key1="∝" key3="□" key4="f11_placeholder"/>
+    <key key0="π" key1="∅" key3="∘" key4="f12_placeholder"/>
   </row>
   <row>
-    <key key0="χ" key4="ℂ"/>
-    <key key0="τ" key3="←" key4="∂"/>
-    <key key0="ι" key3="↓" key4="∫"/>
-    <key key0="ε" key3="→" key4="∃"/>
-    <key key0="ο" key4="∈"/>
-    <key key0="β" key1="⊕" key4="4"/>
-    <key key0="ν" key1="⊖" key3="ℕ" key4="5"/>
-    <key key0="ρ" key1="⊙" key3="ℝ" key4="6"/>
-    <key key0="σ" key1="⊗"/>
-    <key key0="γ" key1="⌀"/>
+    <key key0="α" key4="ℂ"/>
+    <key key0="σ" key3="←" key4="∂"/>
+    <key key0="δ" key3="↓" key4="∫"/>
+    <key key0="φ" key3="→" key4="∃"/>
+    <key key0="γ" key4="∈"/>
+    <key key0="η" key1="⊕" key4="4"/>
+    <key key0="ξ" key1="⊖" key3="ℕ" key4="5"/>
+    <key key0="κ" key1="⊙" key3="ℝ" key4="6"/>
+    <key key0="λ" key1="⊗"/>
+    <key key0="ϡ" key1="⌀"/>
   </row>
   <row>
     <key width="1.5" key0="shift" key2="loc capslock"/>
-    <key key0="φ" key3="⇌" key4="√"/>
-    <key key0="η" key3="accent_arrow_right" key4="∪"/>
-    <key key0="ϡ" key4="∩"/>
-    <key key0="υ" key3="∇" key4="ℵ"/>
-    <key key0="ζ" key1="≤" key3="ℤ" key4="1"/>
-    <key key0="Ϟ" key1="≠" key3="ℚ" key4="2"/>
-    <key key0="κ" key1="≥" key3="×" key4="3"/>
+    <key key0="ζ" key3="⇌" key4="√"/>
+    <key key0="χ" key3="accent_arrow_right" key4="∪"/>
+    <key key0="ϛ" key4="∩"/>
+    <key key0="ϟ" key3="∇" key4="ℵ"/>
+    <key key0="β" key1="≤" key3="ℤ" key4="1"/>
+    <key key0="ν" key1="≠" key3="ℚ" key4="2"/>
+    <key key0="μ" key1="≥" key3="×" key4="3"/>
     <key width="1.5" key0="backspace" key3="delete"/>
   </row>
   <row height="0.95">
@@ -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>

res/xml/method.xml

@@ -1,26 +1,40 @@
 <?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,extra_keys=accent_aigu|accent_ogonek|accent_dot_above|ł"/>
-  <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="ar" android:imeSubtypeLocale="ar" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=arabic,default_layout=arab_pc_hindu"/>
+  <subtype android:label="%s" android:languageTag="ar" android:imeSubtypeLocale="ar_TN" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=arabic,default_layout=arab_pc"/>
+  <subtype android:label="%s" android:languageTag="ay" android:imeSubtypeLocale="ay_AM" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=armenian,default_layout=armenian_ph_am"/>
+  <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_ueishsht,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=accent_aigu:á:é:í:ó:ú:ý|accent_ring:ů|accent_caron:č:ě:ň:ř:š:ž:ď:ť"/>
+  <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_aigu:á:é:í:ó:ú|accent_tilde:ñ|accent_grave|accent_trema|€"/>
+  <subtype android:label="%s" android:languageTag="fa" android:imeSubtypeLocale="fa_IR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=arab_pc_ir"/>
+  <subtype android:label="%s" android:languageTag="fr-CH" android:imeSubtypeLocale="fr_CH" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwertz_fr_ch,extra_keys=accent_grave:à:è:ù|accent_aigu:é|accent_circonflexe:â:ê:ô|accent_cedille:ç|accent_trema:ë:ï:ü:ÿ|€"/>
+  <subtype android:label="%s" android:languageTag="fr-FR" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_azerty_fr,extra_keys=accent_grave:à:è:ù@a|accent_aigu:é@e|accent_circonflexe:â:ê:ô@e|accent_cedille:ç@c|accent_trema:ë:ï:ü:ÿ@l|€"/>
+  <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|accent_double_aigu:ő:ű|€"/>
+  <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_trema:ö|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:é:ó|accent_circonflexe:î|€|ə"/>
+  <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_macron:ā:ē:ī:ū|accent_caron:č:š:ž|accent_ogonek:ķ:ļ:ņ|accent_cedille:ģ|€"/>
+  <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:á:é:í:ó:ú:ý:j́|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=€|æ|å|ø|accent_aigu:é:ó|accent_grave:è:ò:ù|accent_circonflexe:ê:ô"/>
+  <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=accent_caron:ě:ř:ž:š:č:ň:ď:ľ:ť|accent_ring:ů|accent_circonflexe:ô|accent_trema:ä:ü:ö|accent_aigu:á:é:í:ó:ú:ŕ:ś:ĺ:ý"/>
+  <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:ö:ü|accent_circonflexe:â:î:û|₺|ı|ğ"/>
+  <subtype android:label="%s" android:languageTag="tly" android:imeSubtypeLocale="tly_AZ" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="script=latin,default_layout=latn_qwerty_tly,extra_keys=á|ú|â|ê|ı|š|ž"/>
+  <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>

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>

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="^"/>

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"/>
@@ -10,7 +10,7 @@
     <key shift="1.0" key0="4" indication="GHI"/>
     <key key0="5" indication="JKL"/>
     <key key0="6" indication="MNO"/>
-    <key key0="(" key3=":" key4="-"/>
+    <key key0="(" key2="=" key3=":" key4="-"/>
   </row>
   <row>
     <key shift="1.0" key0="7" indication="PQRS"/>
@@ -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>

res/xml/settings.xml

@@ -1,64 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
   <PreferenceCategory android:title="@string/pref_category_layout">
-    <juloo.keyboard2.LayoutListPreference android:key="layout" android:title="@string/pref_layout_title" app:defaultString="@string/pref_layout_e_system"/>
-    <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"/>
+    <juloo.keyboard2.prefs.LayoutsPreference/>
     <PreferenceScreen android:title="@string/pref_extra_keys_title">
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="0"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="1"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="2"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="3"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="4"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="5"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="6"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="7"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="8"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="9"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="10"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="11"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="12"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="13"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="14"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="15"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="16"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="17"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="18"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="19"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="20"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="21"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="22"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="23"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="24"/>
-      <juloo.keyboard2.ExtraKeyCheckBoxPreference app:index="25"/>
+      <PreferenceCategory android:title="@string/pref_extra_keys_custom">
+        <juloo.keyboard2.prefs.CustomExtraKeysPreference/>
+      </PreferenceCategory>
+      <juloo.keyboard2.prefs.ExtraKeysPreference android:title="@string/pref_extra_keys_internal"/>
     </PreferenceScreen>
+    <CheckBoxPreference android:key="number_row" android:title="@string/pref_number_row_title" android:summary="@string/pref_number_row_summary" android:defaultValue="false"/>
+    <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"/>
     <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"/>
+    <juloo.keyboard2.prefs.IntSlideBarPreference android:key="longpress_timeout" android:title="@string/pref_long_timeout_title" android:summary="%sms" android:defaultValue="600" min="50" max="2000"/>
+    <juloo.keyboard2.prefs.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="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"/>
+    <CheckBoxPreference android:key="vibrate_custom" android:title="@string/pref_vibrate_custom" android:defaultValue="false"/>
+    <juloo.keyboard2.prefs.IntSlideBarPreference android:dependency="vibrate_custom" android:key="vibrate_duration" android:title="@string/pref_vibrate_duration_title" android:summary="%sms" android:defaultValue="20" min="0" max="100"/>
+    <CheckBoxPreference android:key="pin_entry_enabled" android:title="@string/pref_pin_entry_enabled_title" android:summary="@string/pref_pin_entry_enabled_summary" android:defaultValue="true"/>
   </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="margin_bottom" android:title="@string/pref_margin_bottom_title" android:summary="%sdp" android:defaultValue="5" min="0" max="100"/>
-    <juloo.common.IntSlideBarPreference android:key="keyboard_height" android:title="@string/pref_keyboard_height_title" android:summary="%s%%" android:defaultValue="35" min="10" max="50"/>
-    <juloo.common.IntSlideBarPreference android:key="keyboard_height_landscape" android:title="@string/pref_keyboard_height_landscape_title" android:summary="%s%%" android:defaultValue="50" min="20" max="65"/>
-    <juloo.common.IntSlideBarPreference android:key="horizontal_margin" android:title="@string/pref_horizontal_margin_title" android:summary="%sdp" android:defaultValue="3" min="0" max="20"/>
-    <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.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>
-  <PreferenceCategory android:title="@string/pref_category_advanced">
-    <EditTextPreference android:key="custom_layout" android:title="@string/pref_custom_layout_title" android:summary="@string/pref_custom_layout_summary" android:inputType="text|textMultiLine|textLongMessage"/>
+    <juloo.keyboard2.prefs.IntSlideBarPreference android:key="label_brightness" android:title="@string/pref_label_brightness" android:summary="%s%%" android:defaultValue="100" min="50" max="100"/>
+    <juloo.keyboard2.prefs.IntSlideBarPreference android:key="keyboard_opacity" android:title="@string/pref_keyboard_opacity" android:summary="%s%%" android:defaultValue="100" min="0" max="100"/>
+    <juloo.keyboard2.prefs.IntSlideBarPreference android:key="key_opacity" android:title="@string/pref_key_opacity" android:summary="%s%%" android:defaultValue="100" min="0" max="100"/>
+    <juloo.keyboard2.prefs.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.keyboard2.prefs.IntSlideBarPreference android:key="margin_bottom_portrait" android:title="@string/pref_portrait" android:summary="%sdp" android:defaultValue="7" min="0" max="100"/>
+      <juloo.keyboard2.prefs.IntSlideBarPreference android:key="margin_bottom_landscape" android:title="@string/pref_landscape" android:summary="%sdp" android:defaultValue="3" min="0" max="100"/>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="@string/pref_keyboard_height_title">
+      <juloo.keyboard2.prefs.IntSlideBarPreference android:key="keyboard_height" android:title="@string/pref_portrait" android:summary="%s%%" android:defaultValue="35" min="10" max="50"/>
+      <juloo.keyboard2.prefs.IntSlideBarPreference android:key="keyboard_height_landscape" android:title="@string/pref_landscape" android:summary="%s%%" android:defaultValue="50" min="20" max="65"/>
+    </PreferenceScreen>
+    <PreferenceScreen android:title="@string/pref_horizontal_margin_title">
+      <juloo.keyboard2.prefs.IntSlideBarPreference android:key="horizontal_margin_portrait" android:title="@string/pref_portrait" android:summary="%sdp" android:defaultValue="3" min="0" max="30"/>
+      <juloo.keyboard2.prefs.IntSlideBarPreference android:key="horizontal_margin_landscape" android:title="@string/pref_landscape" android:summary="%sdp" android:defaultValue="28" min="0" max="200"/>
+    </PreferenceScreen>
+    <juloo.keyboard2.prefs.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.keyboard2.prefs.SlideBarPreference android:key="key_vertical_margin" android:title="@string/pref_key_vertical_space" android:summary="%s%%" android:defaultValue="1.5" min="0" max="5"/>
+    <juloo.keyboard2.prefs.SlideBarPreference android:key="key_horizontal_margin" android:title="@string/pref_key_horizontal_space" android:summary="%s%%" android:defaultValue="2" min="0" max="5"/>
   </PreferenceCategory>
 </PreferenceScreen>