Release v0.3.5

Add ability to customize switch key (emoji, language)

app/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "dev.patrickgold.florisboard"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 23
-        versionName "0.3.4"
+        versionCode 24
+        versionName "0.3.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/assets/ime/text/symbols2/mod/default.json

@@ -11,10 +11,24 @@
     ],
     [
       { "code": -201, "label": "view_characters", "type": "system_gui" },
-      { "code":   60, "label": "<" },
+      { "code":   60, "label": "<", "popup": {
+        "relevant": [
+          { "code":  171, "label": "«" },
+          { "code": 8804, "label": "≤" },
+          { "code": 8249, "label": "‹" },
+          { "code":10216, "label": "⟨" }
+        ]
+      } },
       { "code": -205, "label": "view_numeric_advanced", "type": "system_gui" },
       { "code":   32, "label": "space" },
-      { "code":   62, "label": ">" },
+      { "code":   62, "label": ">", "popup": {
+        "relevant": [
+          { "code":10217, "label": "⟩" },
+          { "code": 8250, "label": "›" },
+          { "code": 8805, "label": "≥" },
+          { "code":  187, "label": "»" }
+        ]
+      } },
       { "code":   10, "label": "enter", "groupId": 3, "type": "enter_editing" }
     ]
   ]

app/src/main/java/dev/patrickgold/florisboard/ime/core/FlorisBoard.kt

@@ -501,6 +501,7 @@ class FlorisBoard : InputMethodService(), ClipboardManager.OnPrimaryClipChangedL
                 switchToPreviousInputMethod()
             } else {
                 window.window?.let { window ->
+                    @Suppress("DEPRECATION")
                     imeManager?.switchToLastInputMethod(window.attributes.token)
                 }
             }
@@ -510,6 +511,22 @@ class FlorisBoard : InputMethodService(), ClipboardManager.OnPrimaryClipChangedL
         }
     }
 
+    fun switchToNextKeyboard(){
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                switchToNextInputMethod(false)
+            } else {
+                window.window?.let { window ->
+                    @Suppress("DEPRECATION")
+                    imeManager?.switchToNextInputMethod(window.attributes.token, false)
+                }
+            }
+        } catch (e: Exception) {
+            Timber.e(e,"Unable to switch to the next IME")
+            imeManager?.showInputMethodPicker()
+        }
+    }
+
     fun switchToPrevSubtype() {
         activeSubtype = subtypeManager.switchToPrevSubtype() ?: Subtype.DEFAULT
         onSubtypeChanged(activeSubtype)

app/src/main/java/dev/patrickgold/florisboard/ime/core/PrefHelper.kt

@@ -25,6 +25,7 @@ import dev.patrickgold.florisboard.ime.text.gestures.DistanceThreshold
 import dev.patrickgold.florisboard.ime.text.gestures.SwipeAction
 import dev.patrickgold.florisboard.ime.text.gestures.VelocityThreshold
 import dev.patrickgold.florisboard.ime.text.key.KeyHintMode
+import dev.patrickgold.florisboard.ime.text.key.SwitchKeyMode
 import dev.patrickgold.florisboard.ime.theme.ThemeMode
 import dev.patrickgold.florisboard.util.TimeUtil
 import dev.patrickgold.florisboard.util.VersionName
@@ -320,6 +321,7 @@ class PrefHelper(
             const val POPUP_ENABLED =                   "keyboard__popup_enabled"
             const val SOUND_ENABLED =                   "keyboard__sound_enabled"
             const val SOUND_VOLUME =                    "keyboard__sound_volume"
+            const val SWITCH_KEY_MODE =                 "keyboard__switch_key_mode"
             const val VIBRATION_ENABLED =               "keyboard__vibration_enabled"
             const val VIBRATION_STRENGTH =              "keyboard__vibration_strength"
         }
@@ -364,6 +366,9 @@ class PrefHelper(
         var soundVolume: Int = 0
             get() = prefHelper.getPref(SOUND_VOLUME, -1)
             private set
+        var switchKeyMode: SwitchKeyMode
+            get() =  SwitchKeyMode.fromString(prefHelper.getPref(SWITCH_KEY_MODE, SwitchKeyMode.DYNAMIC_LANGUAGE_EMOJI.toString()))
+            set(v) = prefHelper.setPref(SWITCH_KEY_MODE, v)
         var vibrationEnabled: Boolean = false
             get() = prefHelper.getPref(VIBRATION_ENABLED, true)
             private set

app/src/main/java/dev/patrickgold/florisboard/ime/text/TextInputManager.kt

@@ -16,9 +16,12 @@
 
 package dev.patrickgold.florisboard.ime.text
 
+import android.animation.ObjectAnimator
+import android.animation.ValueAnimator
 import android.content.Context
 import android.os.Handler
 import android.view.KeyEvent
+import android.view.View
 import android.view.inputmethod.*
 import android.widget.LinearLayout
 import android.widget.Toast
@@ -27,10 +30,7 @@ import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.ime.core.*
 import dev.patrickgold.florisboard.ime.text.editing.EditingKeyboardView
 import dev.patrickgold.florisboard.ime.text.gestures.SwipeAction
-import dev.patrickgold.florisboard.ime.text.key.KeyCode
-import dev.patrickgold.florisboard.ime.text.key.KeyData
-import dev.patrickgold.florisboard.ime.text.key.KeyType
-import dev.patrickgold.florisboard.ime.text.key.KeyVariation
+import dev.patrickgold.florisboard.ime.text.key.*
 import dev.patrickgold.florisboard.ime.text.keyboard.KeyboardMode
 import dev.patrickgold.florisboard.ime.text.keyboard.KeyboardView
 import dev.patrickgold.florisboard.ime.text.layout.LayoutManager
@@ -38,6 +38,7 @@ import dev.patrickgold.florisboard.ime.text.smartbar.SmartbarView
 import kotlinx.coroutines.*
 import timber.log.Timber
 import java.util.*
+import kotlin.math.roundToLong
 
 /**
  * TextInputManager is responsible for managing everything which is related to text input. All of
@@ -58,11 +59,13 @@ class TextInputManager private constructor() : CoroutineScope by MainScope(),
         get() = florisboard.activeEditorInstance
 
     private var activeKeyboardMode: KeyboardMode? = null
+    private var animator: ObjectAnimator? = null
     private val keyboardViews = EnumMap<KeyboardMode, KeyboardView>(KeyboardMode::class.java)
     private var editingKeyboardView: EditingKeyboardView? = null
+    private var loadingPlaceholderKeyboard: KeyboardView? = null
     private val osHandler = Handler()
     private var textViewFlipper: ViewFlipper? = null
-    var textViewGroup: LinearLayout? = null
+    private var textViewGroup: LinearLayout? = null
 
     var keyVariation: KeyVariation = KeyVariation.NORMAL
     val layoutManager = LayoutManager(florisboard)
@@ -115,8 +118,13 @@ class TextInputManager private constructor() : CoroutineScope by MainScope(),
         }
     }
 
+    override fun onCreateInputView() {
+        keyboardViews.clear()
+    }
+
     private suspend fun addKeyboardView(mode: KeyboardMode) {
         val keyboardView = KeyboardView(florisboard.context)
+        keyboardView.id = View.generateViewId()
         keyboardView.computedLayout = layoutManager.fetchComputedLayoutAsync(mode, florisboard.activeSubtype, florisboard.prefs).await()
         keyboardViews[mode] = keyboardView
         textViewFlipper?.addView(keyboardView)
@@ -128,14 +136,38 @@ class TextInputManager private constructor() : CoroutineScope by MainScope(),
     override fun onRegisterInputView(inputView: InputView) {
         Timber.i("onRegisterInputView(inputView)")
 
-        launch(Dispatchers.Main) {
-            textViewGroup = inputView.findViewById(R.id.text_input)
-            textViewFlipper = inputView.findViewById(R.id.text_input_view_flipper)
-            editingKeyboardView = inputView.findViewById(R.id.editing)
+        textViewGroup = inputView.findViewById(R.id.text_input)
+        textViewFlipper = inputView.findViewById(R.id.text_input_view_flipper)
+        editingKeyboardView = inputView.findViewById(R.id.editing)
+        loadingPlaceholderKeyboard = inputView.findViewById(R.id.keyboard_preview)
 
+        launch(Dispatchers.Main) {
+            textViewGroup?.let {
+                animator = ObjectAnimator.ofFloat(it, "alpha", 0.9f, 1.0f).apply {
+                    duration = 125
+                    repeatCount = ValueAnimator.INFINITE
+                    repeatMode = ValueAnimator.REVERSE
+                    start()
+                    launch {
+                        delay(duration)
+                        try {
+                            duration = 500
+                            setFloatValues(1.0f, 0.4f)
+                        } catch (_: Exception) {}
+                    }
+                }
+            }
             val activeKeyboardMode = getActiveKeyboardMode()
             addKeyboardView(activeKeyboardMode)
             setActiveKeyboardMode(activeKeyboardMode)
+            animator?.cancel()
+            textViewGroup?.let {
+                animator = ObjectAnimator.ofFloat(it, "alpha", it.alpha, 1.0f).apply {
+                    duration = (((1.0f - it.alpha) / 0.6f) * 125f).roundToLong()
+                    repeatCount = 0
+                    start()
+                }
+            }
             for (mode in KeyboardMode.values()) {
                 if (mode != activeKeyboardMode && mode != KeyboardMode.SMARTBAR_NUMBER_ROW) {
                     addKeyboardView(mode)
@@ -246,11 +278,11 @@ class TextInputManager private constructor() : CoroutineScope by MainScope(),
     /**
      * Sets [activeKeyboardMode] and updates the [SmartbarView.isQuickActionsVisible] state.
      */
-    fun setActiveKeyboardMode(mode: KeyboardMode) {
+    private fun setActiveKeyboardMode(mode: KeyboardMode) {
         textViewFlipper?.displayedChild = textViewFlipper?.indexOfChild(when (mode) {
             KeyboardMode.EDITING -> editingKeyboardView
             else -> keyboardViews[mode]
-        }) ?: 0
+        })?.coerceAtLeast(0) ?: 0
         keyboardViews[mode]?.updateVisibility()
         keyboardViews[mode]?.requestLayout()
         keyboardViews[mode]?.requestLayoutAllKeys()
@@ -412,6 +444,18 @@ class TextInputManager private constructor() : CoroutineScope by MainScope(),
         }
     }
 
+    /**
+     * Handles a [KeyCode.LANGUAGE_SWITCH] event. Also handles if the language switch should cycle
+     * FlorisBoard internal or system-wide.
+     */
+    private fun handleLanguageSwitch() {
+        when (florisboard.prefs.keyboard.switchKeyMode) {
+            SwitchKeyMode.DYNAMIC_LANGUAGE_EMOJI,
+            SwitchKeyMode.ALWAYS_LANGUAGE_INTERNAL -> florisboard.switchToNextSubtype()
+            else -> florisboard.switchToNextKeyboard()
+        }
+    }
+
     /**
      * Handles a [KeyCode.SHIFT] event.
      */
@@ -627,7 +671,7 @@ class TextInputManager private constructor() : CoroutineScope by MainScope(),
                 handleEnter()
                 smartbarView?.resetClipboardSuggestion()
             }
-            KeyCode.LANGUAGE_SWITCH -> florisboard.switchToNextSubtype()
+            KeyCode.LANGUAGE_SWITCH -> handleLanguageSwitch()
             KeyCode.SETTINGS -> florisboard.launchSettings()
             KeyCode.SHIFT -> handleShift()
             KeyCode.SHOW_INPUT_METHOD_PICKER -> {

app/src/main/java/dev/patrickgold/florisboard/ime/text/key/KeyView.kt

@@ -245,13 +245,22 @@ class KeyView(
                             }
                         }
                     }
-                    longKeyPressHandler.postDelayed(delayMillis) {
-                        if (data.popup.isNotEmpty()) {
-                            keyboardView.popupManager.extend(this, keyHintMode)
+                    if (data.code == KeyCode.SPACE) {
+                        longKeyPressHandler.postDelayed((delayMillis * 2.5f).toLong()) {
+                            when (prefs.gestures.spaceBarLongPress) {
+                                SwipeAction.NO_ACTION,
+                                SwipeAction.INSERT_SPACE -> {}
+                                else -> {
+                                    florisboard?.executeSwipeAction(prefs.gestures.spaceBarLongPress)
+                                    shouldBlockNextKeyCode = true
+                                }
+                            }
                         }
-                        if (data.code == KeyCode.SPACE) {
-                            florisboard?.executeSwipeAction(prefs.gestures.spaceBarLongPress)
-                            shouldBlockNextKeyCode = true
+                    } else {
+                        longKeyPressHandler.postDelayed(delayMillis) {
+                            if (data.popup.isNotEmpty()) {
+                                keyboardView.popupManager.extend(this, keyHintMode)
+                            }
                         }
                     }
                 }
@@ -480,35 +489,53 @@ class KeyView(
     }
 
     override fun onThemeUpdated(theme: Theme) {
-        if (keyboardView.isSmartbarKeyboardView) {
-            themeValueCache.apply {
-                keyBackground = theme.getAttr(Theme.Attr.SMARTBAR_BACKGROUND)
-                keyBackgroundPressed = theme.getAttr(Theme.Attr.SMARTBAR_BUTTON_BACKGROUND)
-                keyForeground = theme.getAttr(Theme.Attr.SMARTBAR_FOREGROUND)
-                keyForegroundAlt = theme.getAttr(Theme.Attr.SMARTBAR_FOREGROUND_ALT)
-                keyForegroundPressed = theme.getAttr(Theme.Attr.SMARTBAR_FOREGROUND)
-                shouldShowBorder = false
-            }
-        } else {
-            val label = data.label
-            val capsSpecific = when {
-                florisboard?.textInputManager?.capsLock == true -> {
-                    "capslock"
-                }
-                florisboard?.textInputManager?.caps == true -> {
-                    "caps"
-                }
-                else -> {
-                    null
+        when {
+            keyboardView.isLoadingPlaceholderKeyboard -> {
+                val label = data.label
+                themeValueCache.apply {
+                    shouldShowBorder = theme.getAttr(Theme.Attr.KEY_SHOW_BORDER, label).toOnOff().state
+                    keyBackground = if (shouldShowBorder) {
+                        theme.getAttr(Theme.Attr.KEY_BACKGROUND, label)
+                    } else {
+                        theme.getAttr(Theme.Attr.SMARTBAR_BUTTON_BACKGROUND, label)
+                    }
+                    keyBackgroundPressed = theme.getAttr(Theme.Attr.KEY_BACKGROUND_PRESSED, label)
+                    keyForeground = keyBackground
+                    keyForegroundAlt = ThemeValue.SolidColor(0)
+                    keyForegroundPressed = keyBackgroundPressed
                 }
             }
-            themeValueCache.apply {
-                keyBackground = theme.getAttr(Theme.Attr.KEY_BACKGROUND, label, capsSpecific)
-                keyBackgroundPressed = theme.getAttr(Theme.Attr.KEY_BACKGROUND_PRESSED, label, capsSpecific)
-                keyForeground = theme.getAttr(Theme.Attr.KEY_FOREGROUND, label, capsSpecific)
-                keyForegroundAlt = ThemeValue.SolidColor(0)
-                keyForegroundPressed = theme.getAttr(Theme.Attr.KEY_FOREGROUND_PRESSED, label, capsSpecific)
-                shouldShowBorder = theme.getAttr(Theme.Attr.KEY_SHOW_BORDER, label, capsSpecific).toOnOff().state
+            keyboardView.isSmartbarKeyboardView -> {
+                themeValueCache.apply {
+                    keyBackground = theme.getAttr(Theme.Attr.SMARTBAR_BACKGROUND)
+                    keyBackgroundPressed = theme.getAttr(Theme.Attr.SMARTBAR_BUTTON_BACKGROUND)
+                    keyForeground = theme.getAttr(Theme.Attr.SMARTBAR_FOREGROUND)
+                    keyForegroundAlt = theme.getAttr(Theme.Attr.SMARTBAR_FOREGROUND_ALT)
+                    keyForegroundPressed = theme.getAttr(Theme.Attr.SMARTBAR_FOREGROUND)
+                    shouldShowBorder = false
+                }
+            }
+            else -> {
+                val label = data.label
+                val capsSpecific = when {
+                    florisboard?.textInputManager?.capsLock == true -> {
+                        "capslock"
+                    }
+                    florisboard?.textInputManager?.caps == true -> {
+                        "caps"
+                    }
+                    else -> {
+                        null
+                    }
+                }
+                themeValueCache.apply {
+                    keyBackground = theme.getAttr(Theme.Attr.KEY_BACKGROUND, label, capsSpecific)
+                    keyBackgroundPressed = theme.getAttr(Theme.Attr.KEY_BACKGROUND_PRESSED, label, capsSpecific)
+                    keyForeground = theme.getAttr(Theme.Attr.KEY_FOREGROUND, label, capsSpecific)
+                    keyForegroundAlt = ThemeValue.SolidColor(0)
+                    keyForegroundPressed = theme.getAttr(Theme.Attr.KEY_FOREGROUND_PRESSED, label, capsSpecific)
+                    shouldShowBorder = theme.getAttr(Theme.Attr.KEY_SHOW_BORDER, label, capsSpecific).toOnOff().state
+                }
             }
         }
         updateKeyPressedBackground()
@@ -562,17 +589,31 @@ class KeyView(
         when (data.code) {
             KeyCode.SWITCH_TO_TEXT_CONTEXT,
             KeyCode.SWITCH_TO_MEDIA_CONTEXT -> {
-                visibility = if (florisboard?.shouldShowLanguageSwitch() == true) {
-                    GONE
-                } else {
-                    VISIBLE
+                visibility = when (prefs.keyboard.switchKeyMode) {
+                    SwitchKeyMode.ALWAYS_LANGUAGE_INTERNAL,
+                    SwitchKeyMode.ALWAYS_LANGUAGE_SYSTEM,
+                    SwitchKeyMode.NEVER_SHOW -> GONE
+                    SwitchKeyMode.ALWAYS_EMOJI -> VISIBLE
+                    SwitchKeyMode.DYNAMIC_LANGUAGE_EMOJI ->
+                        if (florisboard?.shouldShowLanguageSwitch() == true) {
+                            GONE
+                        } else {
+                            VISIBLE
+                        }
                 }
             }
             KeyCode.LANGUAGE_SWITCH -> {
-                visibility = if (florisboard?.shouldShowLanguageSwitch() == true) {
-                    VISIBLE
-                } else {
-                    GONE
+                visibility = when (prefs.keyboard.switchKeyMode) {
+                    SwitchKeyMode.ALWAYS_EMOJI,
+                    SwitchKeyMode.NEVER_SHOW -> GONE
+                    SwitchKeyMode.ALWAYS_LANGUAGE_INTERNAL,
+                    SwitchKeyMode.ALWAYS_LANGUAGE_SYSTEM -> VISIBLE
+                    SwitchKeyMode.DYNAMIC_LANGUAGE_EMOJI ->
+                        if (florisboard?.shouldShowLanguageSwitch() == true) {
+                            VISIBLE
+                        } else {
+                            GONE
+                        }
                 }
             }
             else -> if (data.variation != KeyVariation.ALL) {
@@ -802,7 +843,11 @@ class KeyView(
                     }
                 }
             }
-            labelPaint.color = themeValueCache.keyForeground.toSolidColor().color
+            labelPaint.color = if (isKeyPressed && isEnabled) {
+                themeValueCache.keyForegroundPressed.toSolidColor().color
+            } else {
+                themeValueCache.keyForeground.toSolidColor().color
+            }
             labelPaint.alpha = if (keyboardView.computedLayout?.mode == KeyboardMode.CHARACTERS &&
                 data.code == KeyCode.SPACE) { 120 } else { 255 }
             val centerX = measuredWidth / 2.0f

app/src/main/java/dev/patrickgold/florisboard/ime/text/key/SwitchKeyMode.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2020 Patrick Goldinger
+ *
+ * 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
+ *
+ * http://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.
+ */
+
+package dev.patrickgold.florisboard.ime.text.key
+
+import java.util.*
+
+/**
+ * Enum for declaring the switch key modes.
+ */
+enum class SwitchKeyMode {
+    ALWAYS_EMOJI,
+    ALWAYS_LANGUAGE_INTERNAL,
+    ALWAYS_LANGUAGE_SYSTEM,
+    DYNAMIC_LANGUAGE_EMOJI,
+    NEVER_SHOW;
+
+    companion object {
+        fun fromString(string: String): SwitchKeyMode {
+            return valueOf(string.toUpperCase(Locale.ENGLISH))
+        }
+    }
+}

app/src/main/java/dev/patrickgold/florisboard/ime/text/keyboard/KeyboardView.kt

@@ -64,6 +64,7 @@ class KeyboardView : LinearLayout, FlorisBoard.EventListener, SwipeGesture.Liste
     private var initialKeyCode: Int = 0
     private val isPreviewMode: Boolean
     val isSmartbarKeyboardView: Boolean
+    val isLoadingPlaceholderKeyboard: Boolean
     var popupManager = PopupManager<KeyboardView, KeyView>(this, florisboard?.popupLayerView)
     private val prefs: PrefHelper = PrefHelper.getDefaultInstance(context)
     private val themeManager: ThemeManager = ThemeManager.default()
@@ -75,6 +76,7 @@ class KeyboardView : LinearLayout, FlorisBoard.EventListener, SwipeGesture.Liste
         context.obtainStyledAttributes(attrs, R.styleable.KeyboardView).apply {
             isPreviewMode = getBoolean(R.styleable.KeyboardView_isPreviewKeyboard, false)
             isSmartbarKeyboardView = getBoolean(R.styleable.KeyboardView_isSmartbarKeyboard, false)
+            isLoadingPlaceholderKeyboard = getBoolean(R.styleable.KeyboardView_isLoadingPlaceholderKeyboard, false)
             recycle()
         }
         orientation = VERTICAL
@@ -84,6 +86,12 @@ class KeyboardView : LinearLayout, FlorisBoard.EventListener, SwipeGesture.Liste
         )
         florisboard?.addEventListener(this)
         onWindowShown()
+        if (isLoadingPlaceholderKeyboard) {
+            computedLayout = ComputedLayoutData.PRE_GENERATED_LOADING_KEYBOARD
+            /*for ((i, row) in children.withIndex()) {
+                row.alpha = (i + 1) * 0.25f
+            }*/
+        }
     }
 
     /**
@@ -166,7 +174,7 @@ class KeyboardView : LinearLayout, FlorisBoard.EventListener, SwipeGesture.Liste
     @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(event: MotionEvent?): Boolean {
         event ?: return false
-        if (isPreviewMode) {
+        if (isPreviewMode || isLoadingPlaceholderKeyboard) {
             return false
         }
         val eventFloris = MotionEvent.obtainNoHistory(event)

app/src/main/java/dev/patrickgold/florisboard/ime/text/layout/LayoutData.kt

@@ -17,6 +17,9 @@
 package dev.patrickgold.florisboard.ime.text.layout
 
 import dev.patrickgold.florisboard.ime.text.key.FlorisKeyData
+import dev.patrickgold.florisboard.ime.text.key.KeyCode
+import dev.patrickgold.florisboard.ime.text.key.KeyData
+import dev.patrickgold.florisboard.ime.text.key.KeyType
 import dev.patrickgold.florisboard.ime.text.keyboard.KeyboardMode
 
 typealias LayoutDataArrangement = List<List<FlorisKeyData>>
@@ -52,4 +55,56 @@ data class ComputedLayoutData(
     val name: String,
     val direction: String,
     val arrangement: ComputedLayoutDataArrangement = mutableListOf()
-)
+) {
+    companion object {
+        val PRE_GENERATED_LOADING_KEYBOARD = ComputedLayoutData(
+            mode = KeyboardMode.CHARACTERS,
+            name = "__loading_keyboard__",
+            direction = "ltr",
+            arrangement = mutableListOf(
+                mutableListOf(
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0)
+                ),
+                mutableListOf(
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0)
+                ),
+                mutableListOf(
+                    FlorisKeyData(code = KeyCode.SHIFT, type = KeyType.MODIFIER, label = "shift"),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = KeyCode.DELETE, type = KeyType.ENTER_EDITING, label = "delete")
+                ),
+                mutableListOf(
+                    FlorisKeyData(code = KeyCode.VIEW_SYMBOLS, type = KeyType.SYSTEM_GUI, label = "view_symbols"),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = KeyCode.SPACE, label = "space"),
+                    FlorisKeyData(code = 0),
+                    FlorisKeyData(code = KeyCode.ENTER, type = KeyType.ENTER_EDITING, label = "enter")
+                )
+            )
+        )
+    }
+}

app/src/main/java/dev/patrickgold/florisboard/ime/theme/AdaptiveThemeOverlay.kt

@@ -16,6 +16,8 @@
 
 package dev.patrickgold.florisboard.ime.theme
 
+import android.graphics.Color
+
 /**
  * Theme overlay class which, if enabled, changes some requested attributes in a Theme and returns
  * the corresponding adaptive color. The adaptive colors itself are determined by the ThemeManager
@@ -29,13 +31,18 @@ class AdaptiveThemeOverlay(
         return when {
             themeManager.isAdaptiveThemeEnabled -> when (ref) {
                 Attr.KEYBOARD_BACKGROUND,
+                Attr.KEY_BACKGROUND_PRESSED,
                 Attr.SMARTBAR_BACKGROUND,
                 Attr.WINDOW_NAVIGATION_BAR_COLOR -> {
                     themeManager.remoteColorPrimaryVariant ?: super.getAttr(ref, s1, s2)
                 }
+                Attr.KEY_FOREGROUND_PRESSED,
                 Attr.SMARTBAR_FOREGROUND -> {
                     themeManager.remoteColorPrimaryVariant?.complimentaryTextColor() ?: super.getAttr(ref, s1, s2)
                 }
+                Attr.SMARTBAR_FOREGROUND_ALT -> {
+                    themeManager.remoteColorPrimaryVariant?.complimentaryTextColor(true) ?: super.getAttr(ref, s1, s2)
+                }
                 Attr.KEY_BACKGROUND,
                 Attr.SMARTBAR_BUTTON_BACKGROUND -> {
                     themeManager.remoteColorPrimary ?: super.getAttr(ref, s1, s2)
@@ -51,6 +58,22 @@ class AdaptiveThemeOverlay(
                         super.getAttr(ref, s1, s2)
                     }
                 }
+                Attr.WINDOW_NAVIGATION_BAR_LIGHT -> {
+                    if (themeManager.remoteColorPrimaryVariant != null) {
+                        ThemeValue.OnOff(themeManager.remoteColorPrimaryVariant?.complimentaryTextColor()?.color == Color.BLACK)
+                    } else {
+                        super.getAttr(ref, s1, s2)
+                    }
+                }
+                Attr.POPUP_BACKGROUND -> {
+                    themeManager.remoteColorSecondary ?: super.getAttr(ref, s1, s2)
+                }
+                Attr.POPUP_BACKGROUND_ACTIVE -> {
+                    themeManager.remoteColorSecondary?.complimentaryTextColor(true) ?: super.getAttr(ref, s1, s2)
+                }
+                Attr.POPUP_FOREGROUND -> {
+                    themeManager.remoteColorSecondary?.complimentaryTextColor() ?: super.getAttr(ref, s1, s2)
+                }
                 else -> super.getAttr(ref, s1, s2)
             }
             else -> super.getAttr(ref, s1, s2)

app/src/main/java/dev/patrickgold/florisboard/ime/theme/Theme.kt

@@ -16,7 +16,9 @@
 
 package dev.patrickgold.florisboard.ime.theme
 
+import android.content.Context
 import android.graphics.Color
+import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.ime.extension.Asset
 
 /**
@@ -53,7 +55,7 @@ open class Theme(
 ) : Asset {
     companion object : Asset.Companion<Theme> {
         private val VALIDATION_REGEX_THEME_LABEL = """^.+${'$'}""".toRegex()
-        private val VALIDATION_REGEX_GROUP_NAME = """^[a-zA-Z]+((:[a-zA-Z]+)|(::[a-zA-Z]+)|(:[a-zA-Z]+:[a-zA-Z]+))?${'$'}""".toRegex()
+        private val VALIDATION_REGEX_GROUP_NAME = """^[a-zA-Z]+((:[a-zA-Z0-9_~]+)|(::[a-zA-Z]+)|(:[a-zA-Z0-9_~]+:[a-zA-Z]+))?${'$'}""".toRegex()
         private val VALIDATION_REGEX_ATTR_NAME = """^[a-zA-Z]+${'$'}""".toRegex()
 
         /**
@@ -67,6 +69,80 @@ open class Theme(
             isNightTheme = true
         )
 
+        /**
+         * Gets the Ui string for a given [attrName]. Used in the theme editor to properly display
+         * attributes for non-advanced users.
+         *
+         * @param context The current activity context, used for retrieving the Ui string.
+         * @param attrName The attribute name, which is used to determine which Ui string should be
+         *  fetched.
+         * @return The Ui string representation, which is localized and can be shown to the user.
+         */
+        fun getUiAttrNameString(context: Context, attrName: String): String {
+            val strId = when (attrName) {
+                "background" ->             R.string.settings__theme__attr_background
+                "backgroundActive" ->       R.string.settings__theme__attr_backgroundActive
+                "backgroundPressed" ->      R.string.settings__theme__attr_backgroundPressed
+                "foreground" ->             R.string.settings__theme__attr_foreground
+                "foregroundAlt" ->          R.string.settings__theme__attr_foregroundAlt
+                "foregroundPressed" ->      R.string.settings__theme__attr_foregroundPressed
+                "showBorder" ->             R.string.settings__theme__attr_showBorder
+                "colorPrimary" ->           R.string.settings__theme__attr_colorPrimary
+                "colorPrimaryDark" ->       R.string.settings__theme__attr_colorPrimaryDark
+                "colorAccent" ->            R.string.settings__theme__attr_colorAccent
+                "navigationBarColor" ->     R.string.settings__theme__attr_navBarColor
+                "navigationBarLight" ->     R.string.settings__theme__attr_navBarLight
+                "semiTransparentColor" ->   R.string.settings__theme__attr_semiTransparentColor
+                "textColor" ->              R.string.settings__theme__attr_textColor
+                else -> null
+            }
+            return if (strId != null) {
+                context.resources.getString(strId)
+            } else {
+                context.resources.getString(
+                    R.string.settings__theme__attr_custom, attrName
+                )
+            }
+        }
+
+        /**
+         * Gets the Ui string for a given [groupName]. Used in the theme editor to properly display
+         * group names for non-advanced users.
+         *
+         * @param context The current activity context, used for retrieving the Ui string.
+         * @param groupName The group name, which is used to determine which Ui string should be
+         *  fetched.
+         * @return The Ui string representation, which is localized and can be shown to the user.
+         */
+        fun getUiGroupNameString(context: Context, groupName: String): String {
+            return when {
+                groupName.startsWith("key:") -> context.resources.getString(
+                    R.string.settings__theme__group_key_specific, groupName.substring(4)
+                )
+                else -> {
+                    val strId = when (groupName) {
+                        "window" ->         R.string.settings__theme__group_window
+                        "keyboard" ->       R.string.settings__theme__group_keyboard
+                        "key" ->            R.string.settings__theme__group_key
+                        "media" ->          R.string.settings__theme__group_media
+                        "oneHanded" ->      R.string.settings__theme__group_oneHanded
+                        "popup" ->          R.string.settings__theme__group_popup
+                        "privateMode" ->    R.string.settings__theme__group_privateMode
+                        "smartbar" ->       R.string.settings__theme__group_smartbar
+                        "smartbarButton" -> R.string.settings__theme__group_smartbarButton
+                        else -> null
+                    }
+                    if (strId != null) {
+                        context.resources.getString(strId)
+                    } else {
+                        context.resources.getString(
+                            R.string.settings__theme__group_custom, groupName
+                        )
+                    }
+                }
+            }
+        }
+
         /**
          * Generate a base theme with the given meta data. For the argument info see [Theme].
          *

app/src/main/java/dev/patrickgold/florisboard/ime/theme/ThemeManager.kt

@@ -17,6 +17,7 @@
 package dev.patrickgold.florisboard.ime.theme
 
 import android.annotation.SuppressLint
+import android.content.ComponentName
 import android.content.Context
 import android.content.pm.PackageManager
 import android.content.res.Configuration
@@ -53,6 +54,8 @@ class ThemeManager private constructor(
         private set
     var remoteColorPrimaryVariant: ThemeValue.SolidColor? = null
         private set
+    var remoteColorSecondary: ThemeValue.SolidColor? = null
+        private set
 
     companion object {
         /**
@@ -113,6 +116,7 @@ class ThemeManager private constructor(
      * @param packageName The package name from which the colors should be extracted.
      */
     @SuppressLint("ResourceType")
+    @Suppress("UNNECESSARY_SAFE_CALL")
     fun updateRemoteColorValues(packageName: String) {
         try {
             val pm = packageManager ?: return
@@ -122,7 +126,10 @@ class ThemeManager private constructor(
                 android.R.attr.colorPrimary,
                 res.getIdentifier("colorPrimaryDark", "attr", packageName),
                 android.R.attr.colorPrimaryDark,
-                res.getIdentifier("colorPrimaryVariant", "attr", packageName)
+                res.getIdentifier("colorPrimaryVariant", "attr", packageName),
+                res.getIdentifier("colorAccent", "attr", packageName),
+                android.R.attr.colorAccent,
+                res.getIdentifier("colorSecondary", "attr", packageName)
             )
             val androidTheme = res.newTheme()
             val defColor = if (activeTheme.isNightTheme) {
@@ -130,11 +137,31 @@ class ThemeManager private constructor(
             } else {
                 Color.WHITE
             }
-            val cn = pm.getLaunchIntentForPackage(packageName)?.component
-            if (cn != null) {
-                androidTheme.applyStyle(pm.getActivityInfo(cn, 0).theme, false)
-                @Suppress("UNNECESSARY_SAFE_CALL")
-                androidTheme.obtainStyledAttributes(attrs.toIntArray())?.let { a ->
+            val themeIds = mutableListOf<Int>()
+            pm.getLaunchIntentForPackage(packageName)?.component?.let { cn ->
+                pm.getActivityInfo(cn, 0)?.let { launchActivity ->
+                    if (launchActivity.targetActivity != null) {
+                        pm.getActivityInfo(ComponentName(packageName, launchActivity.targetActivity), 0)?.let {
+                            themeIds.add(it.theme)
+                        }
+                    } else {
+                        themeIds.add(launchActivity.theme)
+                    }
+                }
+            }
+            pm.getApplicationInfo(packageName, 0)?.let { applicationInfo ->
+                themeIds.add(applicationInfo.theme)
+            }
+            remoteColorPrimary = null
+            remoteColorPrimaryVariant = null
+            remoteColorSecondary = null
+            for (themeId in themeIds) {
+                if (remoteColorPrimary != null && remoteColorPrimaryVariant != null &&
+                        remoteColorSecondary != null) {
+                    break
+                }
+                androidTheme.applyStyle(themeId, false)
+                androidTheme.obtainStyledAttributes(attrs.toIntArray()).let { a ->
                     remoteColorPrimary = when {
                         a.hasValue(0) -> {
                             ThemeValue.SolidColor(a.getColor(0, defColor))
@@ -160,12 +187,35 @@ class ThemeManager private constructor(
                             null
                         }
                     }
+                    remoteColorSecondary = when {
+                        a.hasValue(5) -> {
+                            ThemeValue.SolidColor(a.getColor(5, defColor))
+                        }
+                        a.hasValue(6) -> {
+                            ThemeValue.SolidColor(a.getColor(6, defColor))
+                        }
+                        a.hasValue(7) -> {
+                            ThemeValue.SolidColor(a.getColor(7, defColor))
+                        }
+                        else -> {
+                            null
+                        }
+                    }
                     a.recycle()
                 }
             }
         } catch (e: Exception) {
             e.printStackTrace()
         }
+        remoteColorPrimary?.let {
+            remoteColorPrimary = ThemeValue.SolidColor(it.color or Color.BLACK)
+        }
+        remoteColorPrimaryVariant?.let {
+            remoteColorPrimaryVariant = ThemeValue.SolidColor(it.color or Color.BLACK)
+        }
+        remoteColorSecondary?.let {
+            remoteColorSecondary = ThemeValue.SolidColor(it.color or Color.BLACK)
+        }
     }
 
     /**

app/src/main/java/dev/patrickgold/florisboard/ime/theme/ThemeValue.kt

@@ -44,13 +44,25 @@ sealed class ThemeValue {
             return super.toString()
         }
 
-        fun complimentaryTextColor(): SolidColor {
-            return if (Color.red(color) * 0.299 + Color.green(color) * 0.587 +
+        fun complimentaryTextColor(isAlt: Boolean = false): SolidColor {
+            val ret = if (Color.red(color) * 0.299 + Color.green(color) * 0.587 +
                 Color.blue(color) * 0.114 > 186) {
-                SolidColor(Color.BLACK)
+                Color.BLACK
             } else {
-                SolidColor(Color.WHITE)
+                Color.WHITE
             }
+            return SolidColor(
+                if (isAlt) {
+                    Color.argb(
+                        0x60,
+                        Color.red(ret),
+                        Color.green(ret),
+                        Color.blue(ret)
+                    )
+                } else {
+                    ret
+                }
+            )
         }
     }
 

app/src/main/java/dev/patrickgold/florisboard/settings/ThemeEditorActivity.kt

@@ -16,7 +16,10 @@
 
 package dev.patrickgold.florisboard.settings
 
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
+import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.annotation.IdRes
@@ -24,6 +27,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
 import androidx.core.view.children
+import androidx.core.view.forEach
 import com.github.michaelbull.result.onSuccess
 import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.databinding.ThemeEditorActivityBinding
@@ -41,6 +45,10 @@ import dev.patrickgold.florisboard.settings.components.ThemeAttrView
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 
+/**
+ * This class is the main Ui activity for directly editing a theme used by FlorisBoard. It provides
+ * a base for group and attr views to operate in and also shows a preview of the current changes.
+ */
 class ThemeEditorActivity : AppCompatActivity() {
     private lateinit var binding: ThemeEditorActivityBinding
     private lateinit var layoutManager: LayoutManager
@@ -53,9 +61,13 @@ class ThemeEditorActivity : AppCompatActivity() {
     private var isSaved: Boolean = false
 
     companion object {
-        const val RESULT_CODE_THEME_EDIT_SAVED: Int =       0xFBADC1
-        const val RESULT_CODE_THEME_EDIT_CANCELLED: Int =   0xFBADC2
+        /** Constant code for a theme saved activity result. */
+        const val RESULT_CODE_THEME_EDIT_SAVED: Int = 0xFBADC1
 
+        /** Constant code for a theme cancelled activity result. */
+        const val RESULT_CODE_THEME_EDIT_CANCELLED: Int = 0xFBADC2
+
+        /** Constant key for passing the reference to the theme to edit. */
         const val EXTRA_THEME_REF: String = "theme_ref"
     }
 
@@ -86,16 +98,32 @@ class ThemeEditorActivity : AppCompatActivity() {
         buildUi()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.theme_editor_menu, menu)
+        return true
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             android.R.id.home -> {
                 onBackPressed()
                 true
             }
+            R.id.settings__help -> {
+                val browserIntent = Intent(
+                    Intent.ACTION_VIEW,
+                    Uri.parse(resources.getString(R.string.florisboard__theme_editor_wiki_url))
+                )
+                startActivity(browserIntent)
+                true
+            }
             else -> super.onOptionsItemSelected(item)
         }
     }
 
+    /**
+     * Callback function to handle clicks on the buttons in the bottom bar of this activity.
+     */
     fun onActionClicked(view: View) {
         when (view.id) {
             R.id.add_group_btn -> addGroup()
@@ -105,20 +133,26 @@ class ThemeEditorActivity : AppCompatActivity() {
                 if (Theme.validateField(Theme.ValidationField.THEME_LABEL, themeName)) {
                     val ref = editedThemeRef
                     if (ref != null) {
-                        themeManager.writeTheme(ref, editedTheme.copy(
-                            label = themeName
-                        ))
+                        themeManager.writeTheme(
+                            ref, editedTheme.copy(
+                                label = themeName
+                            )
+                        )
                         isSaved = true
                         finish()
                     }
                 } else {
-                    binding.themeNameLabel.error = resources.getString(R.string.settings__theme_editor__error_theme_label_empty)
+                    binding.themeNameLabel.error =
+                        resources.getString(R.string.settings__theme_editor__error_theme_label_empty)
                     binding.themeNameLabel.isErrorEnabled = true
                 }
             }
         }
     }
 
+    /**
+     * Shows a cancel confirmation dialog when the back key is pressed.
+     */
     override fun onBackPressed() {
         AlertDialog.Builder(this).apply {
             setTitle(R.string.assets__action__cancel_confirm_title)
@@ -133,15 +167,28 @@ class ThemeEditorActivity : AppCompatActivity() {
         }
     }
 
+    /**
+     * Set the result just before this activity finishes according to [isSaved].
+     */
     override fun finish() {
-        setResult(if (isSaved) {
-            RESULT_CODE_THEME_EDIT_SAVED
-        } else {
-            RESULT_CODE_THEME_EDIT_CANCELLED
-        })
+        setResult(
+            if (isSaved) {
+                RESULT_CODE_THEME_EDIT_SAVED
+            } else {
+                RESULT_CODE_THEME_EDIT_CANCELLED
+            }
+        )
         super.finish()
     }
 
+    /**
+     * Add a new group view to the Ui with the specified group [name]. Returns a binding to the
+     * created view class. If [name] is null, this method assumes that a new group should be
+     * instantiated and will show an add group dialog.
+     *
+     * @param name The group name or null for a new group.
+     * @return The binding to the created group view.
+     */
     private fun addGroup(name: String? = null): ThemeEditorGroupViewBinding {
         val groupView = ThemeEditorGroupViewBinding.inflate(layoutInflater)
         groupView.root.themeEditorActivity = this
@@ -154,6 +201,11 @@ class ThemeEditorActivity : AppCompatActivity() {
         return groupView
     }
 
+    /**
+     * Deletes a view from the current Ui stack. Refreshes the theme preview afterwards.
+     *
+     * @param id The id of the group view to remove.
+     */
     fun deleteGroup(@IdRes id: Int) {
         binding.themeAttributes.findViewById<View>(id)?.let {
             binding.themeAttributes.removeView(it)
@@ -161,6 +213,79 @@ class ThemeEditorActivity : AppCompatActivity() {
         refreshTheme()
     }
 
+    /**
+     * This method tries to focus the specified group view (causes the nested scroll view to jump
+     * to the specified group view).
+     *
+     * @param id The id of the group view to focus.
+     */
+    fun focusGroup(@IdRes id: Int) {
+        binding.themeAttributes.findViewById<View>(id)?.let {
+            binding.themeAttributes.requestChildFocus(it, it)
+        }
+    }
+
+    /**
+     * Checks if the current Ui stack has a group view with [name], excluding the group view
+     * specified by [id] to prevent the check on the view that initiated the request.
+     *
+     * @param id The group view to exclude from the check.
+     * @param name The group name to check for.
+     * @return True if the group name exists (except in the group view with [id]), false otherwise.
+     */
+    fun hasGroup(@IdRes id: Int, name: String): Boolean {
+        if (name.isEmpty()) {
+            return false
+        }
+        binding.themeAttributes.forEach { groupView ->
+            if (groupView is ThemeAttrGroupView) {
+                if (groupView.groupName == name && groupView.id != id) {
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
+    /**
+     * Sorts the group views alphabetically by the group, with the exception that "window" and
+     * "keyboard" are always on first and second position if they exist in the current stack.
+     */
+    fun sortGroups() {
+        val baseMap = mutableMapOf<Int, String>()
+        for (groupView in binding.themeAttributes.children) {
+            if (groupView is ThemeAttrGroupView) {
+                baseMap[groupView.id] = groupView.groupName
+            }
+        }
+        val sortedMap = baseMap.toList().sortedBy { (_, v) -> v }.toMap().toMutableMap()
+        val groupIds = sortedMap.keys.toMutableList()
+        val groupNames = sortedMap.values.toMutableList()
+        if (groupNames.contains("keyboard")) {
+            val windowGroupId = groupIds[groupNames.indexOf("keyboard")]
+            groupIds.remove(windowGroupId)
+            groupNames.remove("keyboard")
+            groupIds.add(0, windowGroupId)
+            groupNames.add(0, "keyboard")
+        }
+        if (groupNames.contains("window")) {
+            val windowGroupId = groupIds[groupNames.indexOf("window")]
+            groupIds.remove(windowGroupId)
+            groupNames.remove("window")
+            groupIds.add(0, windowGroupId)
+            groupNames.add(0, "window")
+        }
+        for ((n, groupId) in groupIds.withIndex()) {
+            binding.themeAttributes.findViewById<ThemeAttrGroupView>(groupId)?.let { groupView ->
+                binding.themeAttributes.removeView(groupView)
+                binding.themeAttributes.addView(groupView, n)
+            }
+        }
+    }
+
+    /**
+     * Refreshes the cached theme object and applies it to the preview keyboard view.
+     */
     fun refreshTheme() {
         val tempMap = mutableMapOf<String, Map<String, ThemeValue>>()
         for (groupView in binding.themeAttributes.children) {
@@ -181,6 +306,9 @@ class ThemeEditorActivity : AppCompatActivity() {
         binding.keyboardPreview.onThemeUpdated(editedTheme)
     }
 
+    /**
+     * Builds the Ui for the current [editedTheme]. Also sorts the groups afterwards.
+     */
     private fun buildUi() {
         binding.themeNameValue.setText(editedTheme.label)
         for ((groupName, groupAttrs) in editedTheme.attributes) {
@@ -191,8 +319,10 @@ class ThemeEditorActivity : AppCompatActivity() {
         }
         mainScope.launch {
             binding.keyboardPreview.computedLayout = layoutManager.fetchComputedLayoutAsync(
-                KeyboardMode.CHARACTERS, Subtype.DEFAULT, prefs).await()
+                KeyboardMode.CHARACTERS, Subtype.DEFAULT, prefs
+            ).await()
             binding.keyboardPreview.onThemeUpdated(editedTheme)
         }
+        sortGroups()
     }
 }

app/src/main/java/dev/patrickgold/florisboard/settings/components/ThemeAttrGroupView.kt

@@ -23,6 +23,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
 import androidx.annotation.IdRes
+import androidx.core.view.forEach
 import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.databinding.ThemeEditorAttrViewBinding
 import dev.patrickgold.florisboard.databinding.ThemeEditorGroupDialogBinding
@@ -39,7 +40,7 @@ class ThemeAttrGroupView : LinearLayout {
     var groupName: String = ""
         set(v) {
             field = v
-            binding.groupName.text = v
+            binding.groupName.text = Theme.getUiGroupNameString(context, v)
             refreshTheme()
         }
 
@@ -78,6 +79,20 @@ class ThemeAttrGroupView : LinearLayout {
         refreshTheme()
     }
 
+    fun hasAttr(@IdRes id: Int, name: String): Boolean {
+        if (name.isEmpty()) {
+            return false
+        }
+        binding.root.forEach { attrView ->
+            if (attrView is ThemeAttrView) {
+                if (attrView.attrName == name && attrView.id != id) {
+                    return true
+                }
+            }
+        }
+        return false
+    }
+
     fun refreshTheme() {
         themeEditorActivity?.refreshTheme()
     }
@@ -114,17 +129,20 @@ class ThemeAttrGroupView : LinearLayout {
             dialog = show()
             dialog.getButton(AlertDialog.BUTTON_POSITIVE)?.setOnClickListener {
                 val tempGroupName = dialogView.groupName.text.toString().trim()
-                if (Theme.validateField(Theme.ValidationField.GROUP_NAME, tempGroupName)) {
+                val groupUnique = themeEditorActivity?.hasGroup(id, tempGroupName) != true
+                if (Theme.validateField(Theme.ValidationField.GROUP_NAME, tempGroupName) && groupUnique) {
                     groupName = tempGroupName
                     dialog.dismiss()
                 } else {
-
                     dialogView.groupNameLabel.error = resources.getString(when {
+                        !groupUnique -> R.string.settings__theme_editor__error_group_name_already_exists
                         tempGroupName.isEmpty() -> R.string.settings__theme_editor__error_group_name_empty
                         else -> R.string.settings__theme_editor__error_group_name
                     })
                     dialogView.groupNameLabel.isErrorEnabled = true
                 }
+                themeEditorActivity?.sortGroups()
+                themeEditorActivity?.focusGroup(id)
             }
         }
     }

app/src/main/java/dev/patrickgold/florisboard/settings/components/ThemeAttrView.kt

@@ -19,6 +19,7 @@ package dev.patrickgold.florisboard.settings.components
 import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Context
+import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.util.AttributeSet
 import android.view.LayoutInflater
@@ -52,7 +53,7 @@ class ThemeAttrView : LinearLayout {
     var attrName: String = ""
         set(v) {
             field = v
-            binding.title.text = v
+            binding.title.text = Theme.getUiAttrNameString(context, v)
             themeAttrGroupView?.refreshTheme()
         }
     var attrValue: ThemeValue = ThemeValue.Other("")
@@ -137,7 +138,7 @@ class ThemeAttrView : LinearLayout {
                 ThemeValue.UI_STRING_MAP.keys.indexOf(ThemeValue.SolidColor::class.simpleName!!)
                     .coerceAtLeast(0)
             )
-            configureDialogUi(dialogView, ThemeValue.SolidColor(0))
+            configureDialogUi(dialogView, ThemeValue.SolidColor(Color.BLACK))
         }
         var userTouched = false
         dialogView.attrType.setOnTouchListener { _, _ ->
@@ -159,7 +160,7 @@ class ThemeAttrView : LinearLayout {
                             ThemeValue.Reference("", "")
                         }
                         ThemeValue.SolidColor::class.simpleName -> {
-                            ThemeValue.SolidColor(0)
+                            ThemeValue.SolidColor(Color.BLACK)
                         }
                         ThemeValue.LinearGradient::class.simpleName -> {
                             ThemeValue.LinearGradient(0)
@@ -208,12 +209,14 @@ class ThemeAttrView : LinearLayout {
             dialog = show()
             dialog.getButton(AlertDialog.BUTTON_POSITIVE)?.setOnClickListener {
                 val tempAttrName = dialogView.attrName.text.toString().trim()
-                if (Theme.validateField(Theme.ValidationField.ATTR_NAME, tempAttrName)) {
+                val attrUnique = themeAttrGroupView?.hasAttr(id, tempAttrName) != true
+                if (Theme.validateField(Theme.ValidationField.ATTR_NAME, tempAttrName) && attrUnique) {
                     attrName = tempAttrName
                     attrValue = getThemeValueFromDialogUi(dialogView)
                     dialog.dismiss()
                 } else {
                     dialogView.attrNameLabel.error = resources.getString(when {
+                        !attrUnique -> R.string.settings__theme_editor__error_attr_name_already_exists
                         tempAttrName.isEmpty() -> R.string.settings__theme_editor__error_attr_name_empty
                         else -> R.string.settings__theme_editor__error_attr_name
                     })
@@ -239,6 +242,8 @@ class ThemeAttrView : LinearLayout {
             is ThemeValue.SolidColor -> {
                 dialogView.attrValueSolidColor.isVisible = true
                 dialogView.attrValueSolidColorInt.text = value.toString()
+                dialogView.attrValueSolidColorEditBtn.background.setTint(value.color)
+                dialogView.attrValueSolidColorEditBtn.drawable.setTint(value.complimentaryTextColor().color)
                 dialogView.attrValueSolidColorEditBtn.setOnClickListener {
                     // Method on how to create a dialog which does not have a listener in the
                     // Activity taken from the original source code for the PreferenceCompat class.
@@ -249,7 +254,9 @@ class ThemeAttrView : LinearLayout {
                     }.create()
                     colorPickerDialog.setColorPickerDialogListener(object : ColorPickerDialogListener {
                         override fun onColorSelected(dialogId: Int, color: Int) {
-                            dialogView.attrValueSolidColorInt.text = ThemeValue.SolidColor(color).toString()
+                            val tempSolidColor = ThemeValue.SolidColor(color)
+                            dialogView.attrValueSolidColorInt.text = tempSolidColor.toString()
+                            configureDialogUi(dialogView, tempSolidColor)
                         }
 
                         override fun onDialogDismissed(dialogId: Int) {

app/src/main/res/drawable/ic_help_outline.xml

@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?android:attr/textColorPrimary" android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
+</vector>

app/src/main/res/layout/text_input_layout.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/text_input"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:alpha="0.9">
 
     <include layout="@layout/smartbar"/>
 
@@ -15,21 +17,11 @@
         android:layout_height="wrap_content"
         android:measureAllChildren="true">
 
-        <LinearLayout
+        <dev.patrickgold.florisboard.ime.text.keyboard.KeyboardView
             android:id="@+id/keyboard_preview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            tools:ignore="UselessParent">
-
-            <!-- TODO: make a good looking keyboard preview -->
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="200dp"
-                android:text="Loading keyboard, please wait..."/>
-
-        </LinearLayout>
+            app:isLoadingPlaceholderKeyboard="true"/>
 
         <include layout="@layout/editing_layout"/>
 

app/src/main/res/layout/theme_editor_activity.xml

@@ -58,7 +58,10 @@
                         <com.google.android.material.textfield.TextInputEditText
                             android:id="@+id/theme_name_value"
                             android:layout_width="match_parent"
-                            android:layout_height="wrap_content"/>
+                            android:layout_height="wrap_content"
+                            android:importantForAutofill="no"
+                            android:inputType="textFilter"
+                            android:imeOptions="flagForceAscii|flagNoExtractUi"/>
 
                     </com.google.android.material.textfield.TextInputLayout>
 

app/src/main/res/layout/theme_editor_attr_dialog.xml

@@ -22,7 +22,10 @@
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/attr_name"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:importantForAutofill="no"
+            android:inputType="textFilter"
+            android:imeOptions="flagForceAscii|flagNoExtractUi"/>
 
     </com.google.android.material.textfield.TextInputLayout>
 
@@ -48,7 +51,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:baselineAligned="false">
 
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="0dp"
@@ -64,7 +68,10 @@
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/attr_value_reference_group"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                android:importantForAutofill="no"
+                android:inputType="textFilter"
+                android:imeOptions="flagForceAscii|flagNoExtractUi"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -82,7 +89,10 @@
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/attr_value_reference_attr"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                android:importantForAutofill="no"
+                android:inputType="textFilter"
+                android:imeOptions="flagForceAscii|flagNoExtractUi"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -108,8 +118,9 @@
 
         <ImageButton
             android:id="@+id/attr_value_solid_color_edit_btn"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:background="@drawable/shape_rect_rounded"
             android:src="@drawable/ic_edit"
             android:contentDescription="@string/assets__action__edit"/>
 
@@ -157,7 +168,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:baselineAligned="false">
 
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="0dp"
@@ -173,7 +185,10 @@
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/attr_value_other_text"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content"
+                android:importantForAutofill="no"
+                android:inputType="textFilter"
+                android:imeOptions="flagForceAscii|flagNoExtractUi"/>
 
         </com.google.android.material.textfield.TextInputLayout>
 

app/src/main/res/layout/theme_editor_group_dialog.xml

@@ -21,7 +21,10 @@
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/group_name"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:importantForAutofill="no"
+            android:inputType="textFilter"
+            android:imeOptions="flagForceAscii|flagNoExtractUi"/>
 
     </com.google.android.material.textfield.TextInputLayout>
 

app/src/main/res/menu/theme_editor_menu.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/settings__help"
+        android:icon="@drawable/ic_help_outline"
+        android:title="@string/settings__help"
+        app:showAsAction="always"/>
+
+</menu>

app/src/main/res/values-ar/strings.xml

@@ -64,37 +64,11 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">هذا النوع الفرعي موجود مسبقا!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">مظهر لوحة المفاتيح</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">غير محدد</string>
-    <string name="settings__theme__background" comment="General label for a background preference">لون الخلفية</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">لون الخلفية عند التنشيط</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">لون الخلفية عند الضغط</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">لون الواجهة</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">لون الواجهة (البديل)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">لون الواجهة (وضع الحروف الكبيرة)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">اختر اللون</string>
     <string name="settings__theme__group_window" comment="Theme group label">النافذة والنظام</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">لوحة المفاتيح</string>
     <string name="settings__theme__group_key" comment="Theme group label">المفتاح</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">مفتاح الإدخال</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">نافذة المفتاح المنبثقة</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">مفتاح التحويل</string>
     <string name="settings__theme__group_media" comment="Theme group label">سياق الوسائط</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">اليد الواحدة</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">زر اليد الواحدة</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">الوضع الخاص</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">الشريط الذكـي</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">زر الشريط الذكي</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">اللون الأساسي</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">يتم تطبيقه على تموج علامة تبويب الوسائط الرئيسية وإبراز الاختيار</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">اللون الأساسي (داكن)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">غير مستخدم حاليا ، محجوز للتنفيذ المستقبلي</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">لون التمييز</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">يتم تطبيقه على علامة تبويب الإيموجي</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">لون شريط التصفّح</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">خلفية شريط التصفّح.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">واجهة شريط التصفّح</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">ضبط على التشغيل للواجهة الداكنة أو على إيقاف التشغيل للواجهة الفاتحة.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">إطار المفتاح</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">اضبط على التفعيل لإظهار الإطار أو على الإيقاف لإخفائه</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">تفضيلات لوحة المفاتيح</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">المفاتيح</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">صف الأعداد</string>
@@ -154,7 +128,6 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">أكتب كلمة بتمرير إصبعك عبر حروفها</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] إظهار آثار التمرير</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">سوف يختفي بعد كل كلمة</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">الإيماءات</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">بدون إجراء</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">حذف الحروف بدقة</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">حذف الكلمة الحالية</string>

app/src/main/res/values-cs/strings.xml

@@ -60,34 +60,11 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Tento podtyp již existuje!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Motiv klávesnice</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Definován</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Pozadí</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Barva pozadí při aktivní</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Barva pozadí při stisknutí</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Barva popředí</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Barva popředí (alternativní)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Barva popředí (caps lock)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Vyberte barvu</string>
     <string name="settings__theme__group_window" comment="Theme group label">Okno &amp; systém</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Klávesnice</string>
     <string name="settings__theme__group_key" comment="Theme group label">Klíč</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Klávesa</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Vyskakovací okno klíče</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Shift</string>
     <string name="settings__theme__group_media" comment="Theme group label">Mediální kontext</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">Jednoruční</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">Tlačítko s jednou rukou</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">Smartbar</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Tlačítko Smartbar</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Primární barva</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">Aplikováno na hlavní kartu Media ripple a zvýraznění výběru</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Primární barva (tmavá)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">V současné době se nepoužívá, vyhrazeno pro budoucí implementaci</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Barva přízvuku</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">Aplikováno na kartu Emoji ripple</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Barva navigačního panelu</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">Pozadí navigační lišty.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">Navigační lišta tmavé popředí</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">Nastavte na Zapnuto pro tmavé nebo vypnuté pro světlé popředí.</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Předvolby Klávesnice</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Šipka</string>
     <string name="pref__keyboard__font_size_multiplier_portrait__label" comment="Preference title">Multiplikátor velikosti písma (portrét)</string>
@@ -136,7 +113,6 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">Zadejte slovo posunutím prstu jeho písmeny</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] Zobrazit sestupovou stopu</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">Zmizí po každém slově</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Gesto</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Žádná akce</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">Smazat znaky přesně</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">Smazat aktuální slovo</string>

app/src/main/res/values-da/strings.xml

@@ -64,26 +64,11 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Dette undertastatur findes allerede!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Tastaturtema</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Ikke defineret</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Baggrundsfarve</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Baggrundsfarve når aktiv</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Baggrundsfarve ved tryk</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Forgrundsfarve</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Forgrundsfarve (alternativ)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Forgrundsfarve (caps lock)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Vælg en farve</string>
     <string name="settings__theme__group_window" comment="Theme group label">Vindue &amp; System</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Tastatur</string>
     <string name="settings__theme__group_key" comment="Theme group label">Tast</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Enter-tast</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Tast popup</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Shift-tast</string>
     <string name="settings__theme__group_media" comment="Theme group label">Mediekontekst</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">En-håndstilstand</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">En-håndstilstand knap</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">Privattilstand</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">SmartBjælke</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Smartbjælke knap</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Primær farve</string>
     <string name="pref__keyboard__height_factor__normal" comment="Preference value">Normal</string>
     <string name="pref__keyboard__height_factor__mid_tall" comment="Preference value">Middel-høj</string>
     <string name="pref__keyboard__height_factor__tall" comment="Preference value">Høj</string>
@@ -122,7 +107,6 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">Skriv ord ved at stryge fingeren igennem bogstaver</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] Vis glidespor</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">Vil forsvinde efter hvert ord</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Bevægelser</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Ingen handling</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">Slet tegn præcist</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">Slet nuværende ord</string>

app/src/main/res/values-de/strings.xml

@@ -40,6 +40,7 @@
     <string name="settings__title" comment="Title of Settings">Einstellungen</string>
     <string name="settings__menu" comment="Hint of top-right three-dot icon in Settings">Weitere Optionen</string>
     <string name="settings__menu_help" comment="Three-dot menu entry for Help and Feedback web link">Hilfe &amp; Feedback</string>
+    <string name="settings__help" comment="General label for help buttons in Settings">Hilfe</string>
     <string name="settings__navigation__home" comment="Long-press hint of bottom nav item Home in Settings">Start</string>
     <string name="settings__navigation__keyboard" comment="Long-press hint of bottom nav item Keyboard in Settings">Tastatur</string>
     <string name="settings__navigation__typing" comment="Long-press hint of bottom nav item Typing in Settings">Schreiben</string>
@@ -64,37 +65,78 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Dieser Eingabestil ist bereits vorhanden!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Tastaturdesign</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Nicht definiert</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Hintergrundfarbe</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Hintergrundfarbe wenn aktiv</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Hintergrundfarbe wenn gedrückt</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Vordergrundfarbe</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Vordergrundfarbe (Alternativ)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Vordergrundfarbe (Umschalttaste festgestellt)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Farbe wählen</string>
+    <string name="pref__theme__mode__label" comment="Label of the theme mode preference">Design-Modus</string>
+    <string name="pref__theme__mode__always_day" comment="Preference value for theme mode">Dauerhafter Tagmodus</string>
+    <string name="pref__theme__mode__always_night" comment="Preference value for theme mode">Dauerhafter Nachtmodus</string>
+    <string name="pref__theme__mode__follow_system" comment="Preference value for theme mode">Systemkonform</string>
+    <string name="pref__theme__mode__follow_time" comment="Preference value for theme mode">Zeitverlauf folgen</string>
+    <string name="pref__theme__sunrise_time__label" comment="Label of the sunrise time preference">Sonnenaufgangszeit</string>
+    <string name="pref__theme__sunset_time__label" comment="Label of the sunset time preference">Sonnenuntergangszeit</string>
+    <string name="pref__theme__day" comment="Label of the day group (day means light theme)">Helles Design</string>
+    <string name="pref__theme__night" comment="Label of the night group (night means dark theme)">Dunkles Design</string>
+    <string name="pref__theme__any_theme__label" comment="Label of the theme selector preference">Ausgewähltes Design</string>
+    <string name="pref__theme__any_theme_adapt_to_app__label" comment="Label of the theme adapt to app preference">Farbdesign an eine App anpassen</string>
+    <string name="pref__theme__any_theme_adapt_to_app__summary" comment="Summary of the theme adapt to app preference">Farbdesign passt sich an die verwendeten App an. Nur möglich wenn die verwendete App diese Funktionalität unterstützt.</string>
+    <string name="pref__theme__source_assets" comment="Label for the theme source field">FlorisBoard App Ressourcen</string>
+    <string name="pref__theme__source_internal" comment="Label for the theme source field">Interner Speicher</string>
+    <string name="pref__theme__source_external" comment="Label for the theme source field">Externer Anbieter</string>
+    <string name="settings__theme_manager__title_day" comment="Title of the theme manager activity for day theme">Design Manager (Tag)</string>
+    <string name="settings__theme_manager__title_night" comment="Title of the theme manager activity for night theme">Design Manager (Nacht)</string>
+    <string name="settings__theme_manager__create_empty" comment="Label of the Create empty FAB action">Leeres Design anlegen</string>
+    <string name="settings__theme_manager__create_from_selected" comment="Label of the Create from selected FAB action">Aus ausgewähltem Design erstellen</string>
+    <string name="settings__theme_manager__theme_custom_title" comment="Title template for a custom theme">Benutzerdefiniert (basierend auf %s)</string>
+    <string name="settings__theme_manager__theme_new_title" comment="Title template for a new theme">Neues Design</string>
+    <string name="settings__theme_editor__title" comment="Title of the edit theme activity">Design bearbeiten</string>
+    <string name="settings__theme_editor__name_label" comment="Label of name input">Name</string>
+    <string name="settings__theme_editor__type_label" comment="Label of type input">Typ</string>
+    <string name="settings__theme_editor__add_group_dialog_title" comment="Title of the add group dialog in the theme editor">Gruppe hinzufügen</string>
+    <string name="settings__theme_editor__edit_group_dialog_title" comment="Title of the edit group dialog in the theme editor">Gruppe bearbeiten</string>
+    <string name="settings__theme_editor__add_attr_dialog_title" comment="Title of the add attribute dialog in the theme editor">Attribute hinzufügen</string>
+    <string name="settings__theme_editor__edit_attr_dialog_title" comment="Title of the edit attribute dialog in the theme editor">Attribut bearbeiten</string>
+    <string name="settings__theme_editor__value_type_reference" comment="Theme value type">Verweis</string>
+    <string name="settings__theme_editor__value_type_reference_group" comment="Theme value type sub-field">Gruppe</string>
+    <string name="settings__theme_editor__value_type_reference_attr" comment="Theme value type sub-field">Attribut</string>
+    <string name="settings__theme_editor__value_type_solid_color" comment="Theme value type">Einheitliche Farbe</string>
+    <string name="settings__theme_editor__value_type_lin_grad" comment="Theme value type">Linearer Farbverlauf</string>
+    <string name="settings__theme_editor__value_type_rad_grad" comment="Theme value type">Radialer Farbverlauf</string>
+    <string name="settings__theme_editor__value_type_on_off" comment="Theme value type">Wechseln</string>
+    <string name="settings__theme_editor__value_type_on_off_state" comment="Theme value type sub-field">Status</string>
+    <string name="settings__theme_editor__value_type_other" comment="Theme value type">Andere</string>
+    <string name="settings__theme_editor__value_type_other_text" comment="Theme value type sub-field">Text</string>
+    <string name="settings__theme_editor__value_preview_content_description" comment="Theme value preview content description">Vorschau der Design Werte</string>
+    <string name="settings__theme_editor__error_theme_label_empty" comment="Error text for an empty theme label">Bitte geben Sie einen Namen für das Design ein.</string>
+    <string name="settings__theme_editor__error_group_name" comment="Error text for an invalid group name">Bitte geben Sie einen Gruppennamen ein, welcher nur die Buchstaben (a-z und/oder A-Z), Doppelpunkte (:) für Untergruppierungen, oder zusätzliche Zahlen (0-9), Tilde (~) und Unterstriche (_) für die Tastenbeschriftung, enthält.</string>
+    <string name="settings__theme_editor__error_group_name_empty" comment="Error text for an empty group name">Bitte geben Sie einen Gruppennamen ein.</string>
+    <string name="settings__theme_editor__error_group_name_already_exists" comment="Error text for a duplicate group name">Dieser Gruppenname existiert bereits in diesem Design. Bitte wählen Sie einen anderen aus.</string>
+    <string name="settings__theme_editor__error_attr_name" comment="Error text for an invalid attribute name">Bitte geben Sie einen Attributnamen ein welcher nur die Buchstaben a-z und/oder A-Z enthält.</string>
+    <string name="settings__theme_editor__error_attr_name_empty" comment="Error text for an empty attribute name">Bitte geben Sie einen Attributnamen ein.</string>
+    <string name="settings__theme_editor__error_attr_name_already_exists" comment="Error text for a duplicate attribute name">Dieser Attributname existiert bereits in dieser Gruppe. Bitte wählen Sie einen anderen aus.</string>
     <string name="settings__theme__group_window" comment="Theme group label">Fenster &amp; System</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Tastatur</string>
     <string name="settings__theme__group_key" comment="Theme group label">Taste</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Eingabetaste</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Tasten Pop-Up</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Umschalttaste</string>
+    <string name="settings__theme__group_key_specific" comment="Theme group label (%s is specific modifier)">Key (%s)</string>
     <string name="settings__theme__group_media" comment="Theme group label">Medienkontext</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">Einhandmodus</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">Einhandmodus Schalter</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">Privater Modus</string>
+    <string name="settings__theme__group_oneHanded" comment="Theme group label">Einhandmodus</string>
+    <string name="settings__theme__group_popup" comment="Theme group label">Popup</string>
+    <string name="settings__theme__group_privateMode" comment="Theme group label">Privater Modus</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">Schnellzugriffsleiste</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Schnellzugriffsleiste Schalter</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Hauptfarbe</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">Wird auf Medien-Reiter und aktuelle Auswahl angewandt</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Hauptfarbe (dunkel)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">Zurzeit nicht in Benutzung, für zukünftige Funktionen reserviert</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Akzentfarbe</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">Wird auf den Emoji-Reiter angewandt</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Farbe der Navigationsleiste</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">Der Hintergrund der Navigationsleiste.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">Dunkler Vordergrund der Navigationsleiste</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">EIN für dunklen oder AUS für hellen Vordergrund.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">Umrandung der Tasten</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">Stellen Sie auf AN, um den Rand anzuzeigen, oder AUS, um ihn auszublenden</string>
+    <string name="settings__theme__group_smartbarButton" comment="Theme group label">Schnellzugriffsleiste Schalter</string>
+    <string name="settings__theme__group_custom" comment="Theme group label (%s is custom group name)">Benutzerdefinierte Gruppe (%s)</string>
+    <string name="settings__theme__attr_background" comment="Theme attribute label">Hintergrundfarbe</string>
+    <string name="settings__theme__attr_backgroundActive" comment="Theme attribute label">Hintergrundfarbe (aktiv)</string>
+    <string name="settings__theme__attr_backgroundPressed" comment="Theme attribute label">Hintergrundfarbe (wenn gedrückt)</string>
+    <string name="settings__theme__attr_foreground" comment="Theme attribute label">Vordergrundfarbe</string>
+    <string name="settings__theme__attr_foregroundAlt" comment="Theme attribute label">Vordergrundfarbe (Alternativ)</string>
+    <string name="settings__theme__attr_foregroundPressed" comment="Theme attribute label">Vordergrundfarbe (wenn gedrückt)</string>
+    <string name="settings__theme__attr_showBorder" comment="Theme attribute label">Rahmen anzeigen</string>
+    <string name="settings__theme__attr_colorPrimary" comment="Theme attribute label">Primärfarbe</string>
+    <string name="settings__theme__attr_colorPrimaryDark" comment="Theme attribute label">Primärfarbe (dunkel)</string>
+    <string name="settings__theme__attr_colorAccent" comment="Theme attribute label">Sekundärfarbe</string>
+    <string name="settings__theme__attr_navBarColor" comment="Theme attribute label">Farbe der Navigationsleiste</string>
+    <string name="settings__theme__attr_navBarLight" comment="Theme attribute label">Dunkler Vordergrund der Navigationsleiste</string>
+    <string name="settings__theme__attr_semiTransparentColor" comment="Theme attribute label">Halbtransparente Farbe</string>
+    <string name="settings__theme__attr_textColor" comment="Theme attribute label">Schriftfarbe</string>
+    <string name="settings__theme__attr_custom" comment="Theme attribute label (%s is custom attribute name)">Benutzerdefinierte Attribute (%s)</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Tastatur-Einstellungen</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Tasten</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">Zahlenreihe</string>
@@ -154,17 +196,23 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">Durch Gleiten über die Buchstaben Wort eingeben</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] Bewegungsspur anzeigen</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">Wird jeweils nach einem Wort ausgeblendet</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Gesten</string>
+    <string name="pref__gestures__general_title" comment="Preference group title">Allgemeine Gesten</string>
+    <string name="pref__gestures__space_bar_title" comment="Preference group title">Leertaste Gesten</string>
+    <string name="pref__gestures__other_title" comment="Preference group title">Andere Gesten / Gesten Schwellenwerte</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Keine Aktion</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">Einzelne Zeichen exakt löschen</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">Aktuelles Wort löschen</string>
     <string name="pref__gestures__swipe_action__delete_words_precisely" comment="Preference value for swipe action">Einzelne Wörter exakt löschen</string>
     <string name="pref__gestures__swipe_action__hide_keyboard" comment="Preference value for swipe action">Tastatur verstecken</string>
+    <string name="pref__gestures__swipe_action__insert_space" comment="Preference value for swipe action">Leerzeichen einfügen</string>
     <string name="pref__gestures__swipe_action__move_cursor_up" comment="Preference value for swipe action">Cursor nach oben bewegen</string>
     <string name="pref__gestures__swipe_action__move_cursor_down" comment="Preference value for swipe action">Cursor nach unten bewegen</string>
     <string name="pref__gestures__swipe_action__move_cursor_left" comment="Preference value for swipe action">Cursor nach links bewegen</string>
     <string name="pref__gestures__swipe_action__move_cursor_right" comment="Preference value for swipe action">Cursor nach rechts bewegen</string>
+    <string name="pref__gestures__swipe_action__move_cursor_start_of_line" comment="Preference value for swipe action">Cursor an den Zeilenanfang bewegen</string>
+    <string name="pref__gestures__swipe_action__move_cursor_end_of_line" comment="Preference value for swipe action">Cursor an das Zeilenende bewegen</string>
     <string name="pref__gestures__swipe_action__shift" comment="Preference value for swipe action">Umschalttaste</string>
+    <string name="pref__gestures__swipe_action__show_input_method_picker" comment="Preference value for swipe action">Auswahl der Eingabemethode anzeigen</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_keyboard" comment="Preference value for swipe action">Zur vorherigen Tastatur wechseln</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_subtype" comment="Preference value for swipe action">Zum vorherigen Eingabestil wechseln</string>
     <string name="pref__gestures__swipe_action__switch_to_next_subtype" comment="Preference value for swipe action">Zum nächsten Eingabestil wechseln</string>
@@ -172,9 +220,10 @@
     <string name="pref__gestures__swipe_down__label" comment="Preference title">Nach unten streichen</string>
     <string name="pref__gestures__swipe_left__label" comment="Preference title">Nach links streichen</string>
     <string name="pref__gestures__swipe_right__label" comment="Preference title">Nach rechts streichen</string>
-    <string name="pref__gestures__space_bar_swipe_up__label" comment="Preference title">Leertaste nach oben wischen</string>
+    <string name="pref__gestures__space_bar_swipe_up__label" comment="Preference title">Leertaste nach oben streichen</string>
     <string name="pref__gestures__space_bar_swipe_left__label" comment="Preference title">Leertaste nach links streichen</string>
     <string name="pref__gestures__space_bar_swipe_right__label" comment="Preference title">Leertaste nach rechts streichen</string>
+    <string name="pref__gestures__space_bar_long_press__label" comment="Preference title">Leertaste lang drücken</string>
     <string name="pref__gestures__delete_key_swipe_left__label" comment="Preference title">Löschtaste nach links streichen</string>
     <string name="pref__gestures__swipe_velocity_threshold__label" comment="Preference title">Gesten-Geschwindigkeitsschwelle</string>
     <string name="pref__gestures__swipe_velocity_threshold__very_slow" comment="Preference value for swipe velocity threshold">Sehr langsam</string>
@@ -203,6 +252,26 @@
     <string name="about__view_source_code" comment="Label of View source code button in About">Quellcode</string>
     <string name="about__license__title" comment="Title of Open-source licenses dialog">Open Source-Lizenzen</string>
     <!-- Assets strings -->
+    <plurals name="assets__file__authors">
+        <item quantity="one">Ersteller</item>
+        <item quantity="other">Ersteller</item>
+    </plurals>
+    <string name="assets__file__name">Name</string>
+    <string name="assets__file__source">Quelle</string>
+    <string name="assets__action__add">Hinzufügen</string>
+    <string name="assets__action__cancel">Abbrechen</string>
+    <string name="assets__action__cancel_confirm_title">Abbruch bestätigen</string>
+    <string name="assets__action__cancel_confirm_message">Wollen Sie wirklich alle ungespeicherten Änderungen verwerfen? Dieser Vorgang kann nicht rückgängig gemacht werden.</string>
+    <string name="assets__action__delete">Löschen</string>
+    <string name="assets__action__delete_confirm_title">Löschvorgang bestätigen</string>
+    <string name="assets__action__delete_confirm_message">Sind Sie sicher, dass sie \"%s\" löschen wollen? Dieser Vorgang kann nicht rückgängig gemacht werden.</string>
+    <string name="assets__action__edit">Bearbeiten</string>
+    <string name="assets__action__export">Exportieren</string>
+    <string name="assets__action__import">Importieren</string>
+    <string name="assets__action__no">Nein</string>
+    <string name="assets__action__save">Speichern</string>
+    <string name="assets__action__yes">Ja</string>
+    <string name="assets__error__invalid">Ungültig</string>
     <!-- Setup UI strings -->
     <string name="setup__title" comment="Title of Setup">Einrichtung</string>
     <string name="setup__prev_button" comment="Label of Previous button in Setup (try to find a short translation due to limited space in UI)">Zurück</string>

app/src/main/res/values-el/strings.xml

@@ -64,37 +64,48 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Αυτός ο υποτύπος υπάρχει ήδη!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Θέμα πληκτρολογίου</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Μη ορισμένο</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Χρώμα φόντου</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Χρώμα φόντου όταν είναι ενεργό</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Χρώμα φόντου όταν πατηθεί</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Χρώμα προσκηνίου</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Χρώμα προσκηνίου (εναλλακτικό)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Χρώμα προσκηνίου (κεφαλαία)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Επιλέξτε ένα χρώμα</string>
+    <string name="pref__theme__mode__label" comment="Label of the theme mode preference">Λειτουργία θέματος</string>
+    <string name="pref__theme__mode__always_day" comment="Preference value for theme mode">Πάντα μέρα</string>
+    <string name="pref__theme__mode__always_night" comment="Preference value for theme mode">Πάντα νύχτα</string>
+    <string name="pref__theme__mode__follow_system" comment="Preference value for theme mode">Σύμφωνα με το σύστημα</string>
+    <string name="pref__theme__mode__follow_time" comment="Preference value for theme mode">Σύμφωνα με την ώρα</string>
+    <string name="pref__theme__sunrise_time__label" comment="Label of the sunrise time preference">Ώρα ανατολής</string>
+    <string name="pref__theme__sunset_time__label" comment="Label of the sunset time preference">Ώρα δύσης</string>
+    <string name="pref__theme__day" comment="Label of the day group (day means light theme)">Θέμα ημέρας</string>
+    <string name="pref__theme__night" comment="Label of the night group (night means dark theme)">Θέμα νύχτας</string>
+    <string name="pref__theme__any_theme__label" comment="Label of the theme selector preference">Επιλεγμένο θέμα</string>
+    <string name="pref__theme__any_theme_adapt_to_app__label" comment="Label of the theme adapt to app preference">Προσαρμογή χρωμάτων στην εφαρμογή</string>
+    <string name="pref__theme__any_theme_adapt_to_app__summary" comment="Summary of the theme adapt to app preference">Τα χρώματα του θέματος προσαρμόζονται σε αυτά της τρέχουσας εφαρμογής, εάν αυτή η εφαρμογή το υποστηρίζει.</string>
+    <string name="pref__theme__source_internal" comment="Label for the theme source field">Εσωτερικός αποθηκευτικός χώρος</string>
+    <string name="settings__theme_manager__title_day" comment="Title of the theme manager activity for day theme">Διαχειριστής Θέματος (Μέρα)</string>
+    <string name="settings__theme_manager__title_night" comment="Title of the theme manager activity for night theme">Διαχειριστής Θέματος (Νύχτα)</string>
+    <string name="settings__theme_manager__create_empty" comment="Label of the Create empty FAB action">Δημιουργία κενού θέματος</string>
+    <string name="settings__theme_manager__create_from_selected" comment="Label of the Create from selected FAB action">Δημιουργία από επιλεγμένο θέμα</string>
+    <string name="settings__theme_manager__theme_custom_title" comment="Title template for a custom theme">Ειδικό (βασισμένο σε %s)</string>
+    <string name="settings__theme_manager__theme_new_title" comment="Title template for a new theme">Νέο θέμα</string>
+    <string name="settings__theme_editor__title" comment="Title of the edit theme activity">Επεξεργασία θέματος</string>
+    <string name="settings__theme_editor__name_label" comment="Label of name input">Όνομα</string>
+    <string name="settings__theme_editor__type_label" comment="Label of type input">Τύπος</string>
+    <string name="settings__theme_editor__add_group_dialog_title" comment="Title of the add group dialog in the theme editor">Προσθήκη ομάδας</string>
+    <string name="settings__theme_editor__edit_group_dialog_title" comment="Title of the edit group dialog in the theme editor">Επεξεργασία ομάδας</string>
+    <string name="settings__theme_editor__add_attr_dialog_title" comment="Title of the add attribute dialog in the theme editor">Προσθήκη χαρακτηριστικού</string>
+    <string name="settings__theme_editor__edit_attr_dialog_title" comment="Title of the edit attribute dialog in the theme editor">Επεξεργασία χαρακτηριστικού</string>
+    <string name="settings__theme_editor__value_type_reference" comment="Theme value type">Αναφορά</string>
+    <string name="settings__theme_editor__value_type_reference_group" comment="Theme value type sub-field">Ομάδα</string>
+    <string name="settings__theme_editor__value_type_reference_attr" comment="Theme value type sub-field">Χαρακτηριστικό</string>
+    <string name="settings__theme_editor__value_type_solid_color" comment="Theme value type">Συμπαγές χρώμα</string>
+    <string name="settings__theme_editor__value_type_on_off" comment="Theme value type">Εναλλαγή</string>
+    <string name="settings__theme_editor__value_type_on_off_state" comment="Theme value type sub-field">Κατάσταση</string>
+    <string name="settings__theme_editor__value_type_other" comment="Theme value type">Άλλο</string>
+    <string name="settings__theme_editor__value_type_other_text" comment="Theme value type sub-field">Κείμενο</string>
+    <string name="settings__theme_editor__value_preview_content_description" comment="Theme value preview content description">Προεπισκόπηση της τιμής του θέματος</string>
+    <string name="settings__theme_editor__error_theme_label_empty" comment="Error text for an empty theme label">Παρακαλώ εισάγετε ένα όνομα για το θέμα.</string>
+    <string name="settings__theme_editor__error_group_name_empty" comment="Error text for an empty group name">Παρακαλώ εισάγετε ένα όνομα για την ομάδα.</string>
     <string name="settings__theme__group_window" comment="Theme group label">Παράθυρο &amp; Σύστημα</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Πληκτρολόγιο</string>
     <string name="settings__theme__group_key" comment="Theme group label">Πλήκτρο</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Πλήκτρο εισαγωγής</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Εμφάνιση πλήκτρων</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Πλήκτρο κεφαλαίων</string>
     <string name="settings__theme__group_media" comment="Theme group label">Περιεχόμενο μέσων</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">Με το ένα χέρι</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">Πλήκτρο λειτουργίας ενός-χεριού</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">Ιδιωτική λειτουργία</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">Έξυπνη Μπάρα</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Πλήκτρο έξυπνης μπάρας</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Κυρίως χρώμα</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">Εφαρμόζεται στην μπάρα κυματισμού των κυρίως μέσων και στην επισήμανση επιλογής</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Κυρίως χρώμα (σκούρο)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">Δεν χρησιμοποιείται προς το παρόν, δεσμευμένο για μελλοντική εφαρμογή</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Χρώμα έμφασης</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">Εφαρμόζεται στον κυματισμό μπάρας των emoji</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Χρώμα μπάρας πλοήγησης</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">To φόντο της μπάρας πλοήγησης.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">Σκούρο προσκήνιο μπάρας πλοήγησης</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">Ορίστε ΕΝΕΡΓΟΠΟΙΗΜΈΝΟ για σκούρο ή ΑΠΕΝΕΡΓΟΠΟΙΗΜΈΝΟ για φωτεινό προσκήνιο.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">Περίγραμμα Πλήκτρου</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">Ενεργοποιείστε για εμφάνιση των περιγραμμάτων ή απενεργοποιείστε για απόκρυψη</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Προτιμήσεις Πληκτρολογίου</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Πλήκτρα</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">Σειρά αριθμών</string>
@@ -154,7 +165,6 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">Πληκτρολογήστε μία λέξη με ολίσθηση του δαχτύλου μέσα από τα γράμματά της</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] Εμφάνιση διαδρομής ολίσθησης</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">Θα εξαφανίζεται μετά από κάθε λέξη</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Κινήσεις</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Καμία ενέργεια</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">Διαγραφή χαρακτήρων με ακρίβεια</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">Διαγραφή της τρέχουσας λέξης</string>
@@ -203,6 +213,21 @@
     <string name="about__view_source_code" comment="Label of View source code button in About">Πηγαίος κώδικας</string>
     <string name="about__license__title" comment="Title of Open-source licenses dialog">Άδειες λογισμικού ανοικτού κώδικα</string>
     <!-- Assets strings -->
+    <string name="assets__file__name">Όνομα</string>
+    <string name="assets__file__source">Πηγή</string>
+    <string name="assets__action__add">Προσθήκη</string>
+    <string name="assets__action__cancel">Ακύρωση</string>
+    <string name="assets__action__cancel_confirm_title">Επιβεβαίωση ακύρωσης</string>
+    <string name="assets__action__delete">Διαγραφή</string>
+    <string name="assets__action__delete_confirm_title">Επιβεβαίωση διαγραφής</string>
+    <string name="assets__action__delete_confirm_message">Είστε βέβαιοι ότι θέλετε να διαγράψετε \"%s\"; Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.</string>
+    <string name="assets__action__edit">Επεξεργασία</string>
+    <string name="assets__action__export">Εξαγωγή</string>
+    <string name="assets__action__import">Εισαγωγή</string>
+    <string name="assets__action__no">Όχι</string>
+    <string name="assets__action__save">Αποθήκευση</string>
+    <string name="assets__action__yes">Ναι</string>
+    <string name="assets__error__invalid">Μη έγκυρο</string>
     <!-- Setup UI strings -->
     <string name="setup__title" comment="Title of Setup">Ρύθμιση</string>
     <string name="setup__prev_button" comment="Label of Previous button in Setup (try to find a short translation due to limited space in UI)">Προηγ</string>

app/src/main/res/values-eo/strings.xml

@@ -44,12 +44,6 @@
     <string name="settings__localization__subtype_layout" comment="Label for keyboard layout dropdown in subtype dialog">Klavaro</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Klavaro etoso</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Nedifinita</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Fona koloro</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Fona koloro kiam aktiva</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Fona koloro kiam depremos</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Malfona koloro</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Malfona koloro (alternativo)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Malfona koloro (fiksiĝema ĉeflitera registrumo)</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Klavaro</string>
     <string name="settings__theme__group_key" comment="Theme group label">Klavo</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Klavaro agordoj</string>
@@ -65,7 +59,6 @@
     <string name="pref__keyboard__height_factor__custom" comment="Preference value">Laŭmenda</string>
     <string name="pref__keyboard__height_factor_custom__label" comment="Preference title">Laŭmenda klavaro alteca valora</string>
     <string name="pref__keyboard__group_keypress__label" comment="Preference group title">Klavaĵo ekdepremi</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Gestoj</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Neniu ago</string>
     <string name="pref__gestures__swipe_up__label" comment="Preference title">Ŝovumi supre</string>
     <string name="pref__gestures__swipe_down__label" comment="Preference title">Ŝovumi sube</string>

app/src/main/res/values-es/strings.xml

@@ -64,37 +64,11 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">¡Este subtipo ya existe!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Tema de teclado</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Sin definir</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Color de fondo</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Color de fondo cuando está activo</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Color de fondo cuando está pulsado</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Color principal</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Color principal (alternativo)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Color principal (bloqueo de mayúsculas)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Seleccionar un color</string>
     <string name="settings__theme__group_window" comment="Theme group label">Ventana y sistema</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Teclado</string>
     <string name="settings__theme__group_key" comment="Theme group label">Tecla</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Tecla Intro</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Tecla emergente</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Tecla Shift</string>
     <string name="settings__theme__group_media" comment="Theme group label">Contexto de multimedia</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">A una mano</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">Botón a una mano</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">Modo privado</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">Barra inteligente</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Bóton de barra inteligente</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Color principal</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">Aplicado al indicador de la pestaña principal de multimedia y al resaltado de la selección</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Color principal (oscuro)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">Actualmente no se utiliza, reservado para su futura aplicación</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Color de acento</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">Aplicado al indicador de la pestaña de los emojis</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Color de la barra de navegación</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">El fondo de la barra de navegación.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">Color principal oscuro de la barra de navegación</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">Establecer en ENCENDIDO para el oscuro o en APAGADO para el claro en el color principal.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">Borde de la tecla</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">Establecer en ENCENDIDO para mostrar el borde o en APAGADO para ocultarlo</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Preferencias de teclado</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Teclas</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">Número de filas</string>
@@ -154,7 +128,6 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">Escriba una palabra deslizando su dedo a través de sus letras</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] Mostrar recorrido del deslizamiento</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">Desaparecerá después de cada palabra</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Gestos</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Sin acción</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">Eliminar caracteres con precisión</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">Eliminar palabra actual</string>

app/src/main/res/values-fa/strings.xml

@@ -33,6 +33,7 @@
     <string name="settings__title" comment="Title of Settings">تنظیمات</string>
     <string name="settings__menu" comment="Hint of top-right three-dot icon in Settings">گزینه‌های بیشتر</string>
     <string name="settings__menu_help" comment="Three-dot menu entry for Help and Feedback web link">کمک &amp; بازخورد</string>
+    <string name="settings__help" comment="General label for help buttons in Settings">راهنمایی</string>
     <string name="settings__navigation__home" comment="Long-press hint of bottom nav item Home in Settings">خانه</string>
     <string name="settings__navigation__keyboard" comment="Long-press hint of bottom nav item Keyboard in Settings">صفحه کلید</string>
     <string name="settings__navigation__typing" comment="Long-press hint of bottom nav item Typing in Settings">نوشتن</string>
@@ -51,22 +52,51 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">این زیرنوع درحال حاضر وجود دارد!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">طرح زمینه صفحه کلید</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">تعریف نشده</string>
-    <string name="settings__theme__background" comment="General label for a background preference">رنگ پس‌زمینه</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">رنگ پس‌زمینه هنگامی که فعال است</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">رنگ پس‌زمینه هنگامی که انتخاب شود</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">رنگ روی‌زمینه</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">رنگ روی‌زمینه (جایگزین)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">رنگ روی‌زمینه (caps lock)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">انتخاب یک رنگ</string>
+    <string name="pref__theme__mode__label" comment="Label of the theme mode preference">حالت طرح‌زمینه</string>
+    <string name="pref__theme__mode__always_day" comment="Preference value for theme mode">همیشه روز</string>
+    <string name="pref__theme__mode__always_night" comment="Preference value for theme mode">همیشه شب</string>
+    <string name="pref__theme__mode__follow_system" comment="Preference value for theme mode">پیروی از سیستم</string>
+    <string name="pref__theme__mode__follow_time" comment="Preference value for theme mode">پیروی از زمان</string>
+    <string name="pref__theme__sunrise_time__label" comment="Label of the sunrise time preference">زمان طلوع</string>
+    <string name="pref__theme__sunset_time__label" comment="Label of the sunset time preference">زمان غروب</string>
+    <string name="pref__theme__day" comment="Label of the day group (day means light theme)">طرح‌زمینه روز</string>
+    <string name="pref__theme__night" comment="Label of the night group (night means dark theme)">طرح‌زمینه شب</string>
+    <string name="pref__theme__any_theme__label" comment="Label of the theme selector preference">طرح زمینه انتخاب شده</string>
+    <string name="pref__theme__any_theme_adapt_to_app__label" comment="Label of the theme adapt to app preference">تطبیق دادن رنگ ها به برنامه</string>
+    <string name="pref__theme__any_theme_adapt_to_app__summary" comment="Summary of the theme adapt to app preference">رنگ های طرح زمینه بر اساس برنامه های فعلی تطبیق داده شوند، اگر برنامه مورد نظر از این پشتیبانی کند.</string>
+    <string name="pref__theme__source_assets" comment="Label for the theme source field">ابزار های برنامه FlorisBoard</string>
+    <string name="pref__theme__source_internal" comment="Label for the theme source field">حافظه داخلی</string>
+    <string name="pref__theme__source_external" comment="Label for the theme source field">ارائه دهنده خارجی</string>
+    <string name="settings__theme_manager__title_day" comment="Title of the theme manager activity for day theme">مدیریت طرح‌ضمینه (روز)</string>
+    <string name="settings__theme_manager__title_night" comment="Title of the theme manager activity for night theme">مدیریت طرح‌ضمینه (شب)</string>
+    <string name="settings__theme_manager__create_empty" comment="Label of the Create empty FAB action">ساختن طرح‌زمینه خالی</string>
+    <string name="settings__theme_manager__create_from_selected" comment="Label of the Create from selected FAB action">ساختن از طرح‌زمینه انتخاب شده</string>
+    <string name="settings__theme_manager__theme_custom_title" comment="Title template for a custom theme">سفارشی (بر اساس %s)</string>
+    <string name="settings__theme_manager__theme_new_title" comment="Title template for a new theme">طرح‌زمینه جدید</string>
+    <string name="settings__theme_editor__title" comment="Title of the edit theme activity">ویرایش طرح زمینه</string>
+    <string name="settings__theme_editor__name_label" comment="Label of name input">نام</string>
+    <string name="settings__theme_editor__type_label" comment="Label of type input">نوع</string>
+    <string name="settings__theme_editor__add_group_dialog_title" comment="Title of the add group dialog in the theme editor">افزودن گروه</string>
+    <string name="settings__theme_editor__edit_group_dialog_title" comment="Title of the edit group dialog in the theme editor">ویرایش گروه</string>
+    <string name="settings__theme_editor__add_attr_dialog_title" comment="Title of the add attribute dialog in the theme editor">افزودن ویژگی</string>
+    <string name="settings__theme_editor__edit_attr_dialog_title" comment="Title of the edit attribute dialog in the theme editor">ویرایش ویژگی</string>
+    <string name="settings__theme_editor__value_type_reference" comment="Theme value type">مرجع</string>
+    <string name="settings__theme_editor__value_type_reference_group" comment="Theme value type sub-field">گروه</string>
+    <string name="settings__theme_editor__value_type_reference_attr" comment="Theme value type sub-field">ویژگی</string>
+    <string name="settings__theme_editor__value_type_solid_color" comment="Theme value type">رنگ ثابت</string>
+    <string name="settings__theme_editor__value_type_on_off" comment="Theme value type">تعویض</string>
+    <string name="settings__theme_editor__value_type_on_off_state" comment="Theme value type sub-field">حالت</string>
+    <string name="settings__theme_editor__value_type_other" comment="Theme value type">ديگر</string>
+    <string name="settings__theme_editor__value_type_other_text" comment="Theme value type sub-field">متن</string>
+    <string name="settings__theme_editor__value_preview_content_description" comment="Theme value preview content description">پیش‌نمایش مقدار طرح زمینه</string>
+    <string name="settings__theme_editor__error_theme_label_empty" comment="Error text for an empty theme label">لطفا نام طرح زمینه را وارد کنید.</string>
+    <string name="settings__theme_editor__error_group_name" comment="Error text for an invalid group name">لطفا نام گروهی را وارد کنید که فقط حاوی حروف (a-z و/یا A-Z) باشد، دونقطه (:) برای زیرگروه ها و یا اعداد (0-9)، آکولاد (~) و زیرخط (_) برای عنوان هر کلید می باشد.</string>
+    <string name="settings__theme_editor__error_group_name_empty" comment="Error text for an empty group name">لطفا یک نام گروه وارد کنید.</string>
+    <string name="settings__theme_editor__error_attr_name" comment="Error text for an invalid attribute name">لطفا نام یک ویژگی را وارد کنید که فقط حاوی حروف a-z و/یا A-Z باشد.</string>
+    <string name="settings__theme_editor__error_attr_name_empty" comment="Error text for an empty attribute name">لطفا نام ویژگی را وارد کنید.</string>
     <string name="settings__theme__group_window" comment="Theme group label">پنجره &amp; سیستم</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">صفحه‌کلید</string>
     <string name="settings__theme__group_key" comment="Theme group label">کلید</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">کلید را وارد کنید</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">پاپ‌آپ کلید</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">کلید Shift</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">حالت خصوصی</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">حاشیه کلید</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">روی روشن بزارید تا حاشیه را نمایش دهد یا روی خاموش بزنید تا مخفی‌اش کند</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">تنظیمات صفحه‌کلید</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">کلیدها</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">ردیف عدد</string>
@@ -122,12 +152,40 @@
     <string name="pref__glide__title" comment="Preference group title">نوشتن گلایدی</string>
     <string name="pref__glide__enabled__label" comment="Preference title">[NYI] فعال سازی نوشتن گلایدی</string>
     <string name="pref__glide__enabled__summary" comment="Preference summary">نوشتن حروف با حرکت مداوم و نگه داشتن روی حرف مورد نظر</string>
+    <string name="pref__gestures__general_title" comment="Preference group title">اشارات کلی</string>
+    <string name="pref__gestures__space_bar_title" comment="Preference group title">دکمه space اشارات</string>
+    <string name="pref__gestures__other_title" comment="Preference group title">دیگر اشارات/ آشارات آستانه</string>
+    <string name="pref__gestures__swipe_action__insert_space" comment="Preference value for swipe action">وارد کردن فاصله</string>
+    <string name="pref__gestures__swipe_action__move_cursor_start_of_line" comment="Preference value for swipe action">انتقال اشاره به شروع خط</string>
+    <string name="pref__gestures__swipe_action__move_cursor_end_of_line" comment="Preference value for swipe action">انتقال اشاره به پایان خط</string>
+    <string name="pref__gestures__swipe_action__show_input_method_picker" comment="Preference value for swipe action">نمایش حالت انتخاب کننده</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_keyboard" comment="Preference value for swipe action">تعویض به صفحه کلید قبلی</string>
     <string name="pref__gestures__space_bar_swipe_up__label" comment="Preference title">کشیدن فاصله</string>
+    <string name="pref__gestures__space_bar_long_press__label" comment="Preference title">نگه داشتن دکمه Space</string>
     <string name="pref__advanced__force_private_mode__label" comment="Label of Force private mode preference in Advanced">حالت خصوصی اجباری</string>
     <string name="pref__advanced__force_private_mode__summary" comment="Summary of Force private mode preference in Advanced">هر ویژگی که که باید با ورودی شما کار کنند را موقتا غیرفعال می کند</string>
     <!-- About UI strings -->
     <!-- Assets strings -->
+    <plurals name="assets__file__authors">
+        <item quantity="one">سازنده</item>
+        <item quantity="other">سازندگان</item>
+    </plurals>
+    <string name="assets__file__name">نام</string>
+    <string name="assets__file__source">منبع</string>
+    <string name="assets__action__add">اضافه کردن</string>
+    <string name="assets__action__cancel">لغو</string>
+    <string name="assets__action__cancel_confirm_title">تائید لغو</string>
+    <string name="assets__action__cancel_confirm_message">آیا مطمعنید که می خواهید هر یک از تغییرات ذخیره نشده را لغو کنید؟ این عمل غیرقابل بازگشت خواهد بود در صورت اجرا.</string>
+    <string name="assets__action__delete">حذف</string>
+    <string name="assets__action__delete_confirm_title">تائید حذف</string>
+    <string name="assets__action__delete_confirm_message">آیا مطمعنید که می خواهید \"%s\" را حذف کنید؟ این عمل غیرقابل بازگشت خواهد بود در صورت اجرا.</string>
+    <string name="assets__action__edit">ویرایش</string>
+    <string name="assets__action__export">استخراج</string>
+    <string name="assets__action__import">واردکردن</string>
+    <string name="assets__action__no">خیر</string>
+    <string name="assets__action__save">ذخیره</string>
+    <string name="assets__action__yes">بله</string>
+    <string name="assets__error__invalid">نامعتبر</string>
     <!-- Setup UI strings -->
     <string name="setup__cancel_button" comment="Label of Cancel button in Setup">لغو</string>
     <string name="setup__next_button" comment="Label of Next button in Setup (try to find a short translation due to limited space in UI)">بعدی</string>

app/src/main/res/values-fi/strings.xml

@@ -60,34 +60,11 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Tämä asettelu on jo lisätty!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Näppäimistön teema</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Ei määritelty</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Taustaväri</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Taustaväri aktiivisena</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Taustaväri painettuna</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Merkin väri</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Merkin väri (vaihtoehtoinen)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Merkin väri (caps lock)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Valitse väri</string>
     <string name="settings__theme__group_window" comment="Theme group label">Ikkuna &amp; järjestelmä</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Näppäimistö</string>
     <string name="settings__theme__group_key" comment="Theme group label">Painike</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Enter-painike</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Painikkeen ponnahdus</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Shift-painike</string>
     <string name="settings__theme__group_media" comment="Theme group label">Mediakonteksti</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">Yksikätinen</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">Yksikätisyyspainike</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">Älypalkki</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Älypalkin painike</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Ensisijainen väri</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">Sovelletaan tärkein media välilehti aaltoilu ja valinta korosta</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Ensisijainen väri (tumma teema)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">Ei toistaiseksi käytössä, valmiina tulevia toimintoja varten</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Aksenttiväri</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">Sovellettu emoji-välilehteen ripple</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Navigointipalkin väri</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">Navigointipalkin tausta.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">Navigointipalkin tummat painikkeet</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">Aseta päälle tummia tai pois päältä vaaleita painikkeita varten.</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Näppäimistön asetukset</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Painikkeet</string>
     <string name="pref__keyboard__font_size_multiplier_portrait__label" comment="Preference title">Fonttikoon kerroin (pystysuunnassa)</string>
@@ -136,7 +113,6 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">Syötä sana liu\'uttamalla sormea sen kirjaimilla</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[EVS] Näytä liu\'un jälki</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">Häviää joka sanan jälkeen</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Eleet</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Ei toimintoa</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">Tarkka merkkien poisto</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">Poista nykyinen sana</string>

app/src/main/res/values-fr/strings.xml

@@ -64,37 +64,54 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Cette disposition existe déjà !</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Thème du clavier</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Non défini</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Couleur d\'arrière-plan</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Couleur d\'arrière-plan lorsque actif</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Couleur d\'arrière-plan lorsqu\'on appuie sur une touche</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Couleur du premier plan</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Couleur d\'avant-plan (alternative)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Couleur d\'avant-plan (verrouillage des majuscules)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Sélectionnez une couleur</string>
+    <string name="pref__theme__mode__label" comment="Label of the theme mode preference">Mode du thème</string>
+    <string name="pref__theme__mode__always_day" comment="Preference value for theme mode">Toujours clair</string>
+    <string name="pref__theme__mode__always_night" comment="Preference value for theme mode">Toujours sombre</string>
+    <string name="pref__theme__mode__follow_system" comment="Preference value for theme mode">Suivre l\'appareil</string>
+    <string name="pref__theme__mode__follow_time" comment="Preference value for theme mode">Suivre l\'heure</string>
+    <string name="pref__theme__sunrise_time__label" comment="Label of the sunrise time preference">Heure du lever du soleil</string>
+    <string name="pref__theme__sunset_time__label" comment="Label of the sunset time preference">Heure du coucher du soleil</string>
+    <string name="pref__theme__day" comment="Label of the day group (day means light theme)">Thème clair</string>
+    <string name="pref__theme__night" comment="Label of the night group (night means dark theme)">Thème sombre</string>
+    <string name="pref__theme__any_theme__label" comment="Label of the theme selector preference">Thème sélectionné</string>
+    <string name="pref__theme__any_theme_adapt_to_app__label" comment="Label of the theme adapt to app preference">Adapter les couleurs à l\'application</string>
+    <string name="pref__theme__any_theme_adapt_to_app__summary" comment="Summary of the theme adapt to app preference">Les couleurs du thème s\'adaptent à celles de l\'application utilisée, si cela est supporté par cette dernière.</string>
+    <string name="pref__theme__source_assets" comment="Label for the theme source field">Ressources de l\'app FlorisBoard</string>
+    <string name="pref__theme__source_internal" comment="Label for the theme source field">Stockage interne</string>
+    <string name="pref__theme__source_external" comment="Label for the theme source field">Fournisseur externe</string>
+    <string name="settings__theme_manager__title_day" comment="Title of the theme manager activity for day theme">Gestionnaire du thème (clair)</string>
+    <string name="settings__theme_manager__title_night" comment="Title of the theme manager activity for night theme">Gestionnaire du thème (sombre)</string>
+    <string name="settings__theme_manager__create_empty" comment="Label of the Create empty FAB action">Créer un thème vide</string>
+    <string name="settings__theme_manager__create_from_selected" comment="Label of the Create from selected FAB action">Créer depuis le thème sélectionné</string>
+    <string name="settings__theme_manager__theme_custom_title" comment="Title template for a custom theme">Personnalisé (basé sur %s)</string>
+    <string name="settings__theme_manager__theme_new_title" comment="Title template for a new theme">Nouveau thème</string>
+    <string name="settings__theme_editor__title" comment="Title of the edit theme activity">Modifier le thème</string>
+    <string name="settings__theme_editor__name_label" comment="Label of name input">Nom</string>
+    <string name="settings__theme_editor__type_label" comment="Label of type input">Type</string>
+    <string name="settings__theme_editor__add_group_dialog_title" comment="Title of the add group dialog in the theme editor">Ajouter un groupe</string>
+    <string name="settings__theme_editor__edit_group_dialog_title" comment="Title of the edit group dialog in the theme editor">Modifier le groupe</string>
+    <string name="settings__theme_editor__add_attr_dialog_title" comment="Title of the add attribute dialog in the theme editor">Ajouter un attribut</string>
+    <string name="settings__theme_editor__edit_attr_dialog_title" comment="Title of the edit attribute dialog in the theme editor">Modifier l\'attribut</string>
+    <string name="settings__theme_editor__value_type_reference" comment="Theme value type">Référence</string>
+    <string name="settings__theme_editor__value_type_reference_group" comment="Theme value type sub-field">Groupe</string>
+    <string name="settings__theme_editor__value_type_reference_attr" comment="Theme value type sub-field">Attribut</string>
+    <string name="settings__theme_editor__value_type_solid_color" comment="Theme value type">Couleur unie</string>
+    <string name="settings__theme_editor__value_type_lin_grad" comment="Theme value type">Dégradé linéaire</string>
+    <string name="settings__theme_editor__value_type_rad_grad" comment="Theme value type">Dégradé radial</string>
+    <string name="settings__theme_editor__value_type_on_off" comment="Theme value type">Changer</string>
+    <string name="settings__theme_editor__value_type_on_off_state" comment="Theme value type sub-field">État</string>
+    <string name="settings__theme_editor__value_type_other" comment="Theme value type">Autre</string>
+    <string name="settings__theme_editor__value_type_other_text" comment="Theme value type sub-field">Texte</string>
+    <string name="settings__theme_editor__value_preview_content_description" comment="Theme value preview content description">Aperçu de la valeur du thème</string>
+    <string name="settings__theme_editor__error_theme_label_empty" comment="Error text for an empty theme label">Veuillez entrer un nom de thème.</string>
+    <string name="settings__theme_editor__error_group_name_empty" comment="Error text for an empty group name">Veuillez entrer un nom de groupe.</string>
+    <string name="settings__theme_editor__error_attr_name" comment="Error text for an invalid attribute name">Veuillez entrer un nom d\'attribut ne contenant que les lettres a-z et/ou A-Z.</string>
+    <string name="settings__theme_editor__error_attr_name_empty" comment="Error text for an empty attribute name">Veuillez entrer un nom d\'attribut.</string>
     <string name="settings__theme__group_window" comment="Theme group label">Fenêtre &amp; Système</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Clavier</string>
     <string name="settings__theme__group_key" comment="Theme group label">Touche</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">La touche Entrer</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Pop-up de touche</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">La touche Maj</string>
     <string name="settings__theme__group_media" comment="Theme group label">Contexte médiatique</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">À une main</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">Bouton à une main</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">Mode privé</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">Barre intelligente</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Bouton de la barre intelligente</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Couleur primaire</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">Appliqué à la sélection et à l\'ondulation de l\'onglet principal des médias</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Couleur primaire (sombre)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">Non utilisé actuellement, réservé pour une implémentation future</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Couleur d\'accentuation</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">Appliqué à l\'ondulation de l\'onglet emoji</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Couleur de la barre de navigation</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">L\'arrière-plan de la barre de navigation.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">Avant-plan sombre de la barre de navigation</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">Réglez sur ON pour sombre ou sur OFF pour clair en avant-plan.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">Bordure des touches</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">Réglez sur ON pour montrer la bordure ou sur OFF pour la cacher</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Préférences de clavier</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Touches</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">Rangée de numéros</string>
@@ -154,17 +171,23 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">Tapez un mot en faisant glisser votre doigt entre ses lettres</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] Montrer la piste de glissement</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">Disparaîtra après chaque mot</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Gestes</string>
+    <string name="pref__gestures__general_title" comment="Preference group title">Gestes généraux</string>
+    <string name="pref__gestures__space_bar_title" comment="Preference group title">Gestes sur la barre d\'espace</string>
+    <string name="pref__gestures__other_title" comment="Preference group title">Autres gestes et seuil des gestes</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Aucune action</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">Effacer les caractères avec précision</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">Supprimer le mot courant</string>
     <string name="pref__gestures__swipe_action__delete_words_precisely" comment="Preference value for swipe action">Supprimer les mots avec précision</string>
     <string name="pref__gestures__swipe_action__hide_keyboard" comment="Preference value for swipe action">Masquer le clavier</string>
+    <string name="pref__gestures__swipe_action__insert_space" comment="Preference value for swipe action">Insérer une espace</string>
     <string name="pref__gestures__swipe_action__move_cursor_up" comment="Preference value for swipe action">Déplacer le curseur vers le haut</string>
     <string name="pref__gestures__swipe_action__move_cursor_down" comment="Preference value for swipe action">Déplacer le curseur vers le bas</string>
     <string name="pref__gestures__swipe_action__move_cursor_left" comment="Preference value for swipe action">Déplacer le curseur vers la gauche</string>
     <string name="pref__gestures__swipe_action__move_cursor_right" comment="Preference value for swipe action">Déplacer le curseur vers la droite</string>
+    <string name="pref__gestures__swipe_action__move_cursor_start_of_line" comment="Preference value for swipe action">Déplacer le curseur au début de la ligne</string>
+    <string name="pref__gestures__swipe_action__move_cursor_end_of_line" comment="Preference value for swipe action">Déplacer le curseur à la fin de la ligne</string>
     <string name="pref__gestures__swipe_action__shift" comment="Preference value for swipe action">Maj</string>
+    <string name="pref__gestures__swipe_action__show_input_method_picker" comment="Preference value for swipe action">Afficher le sélecteur de mode de saisie</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_keyboard" comment="Preference value for swipe action">Passer à la disposition précédente</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_subtype" comment="Preference value for swipe action">Passer à la disposition précédente</string>
     <string name="pref__gestures__swipe_action__switch_to_next_subtype" comment="Preference value for swipe action">Passer à la disposition suivante</string>
@@ -175,6 +198,7 @@
     <string name="pref__gestures__space_bar_swipe_up__label" comment="Preference title">Glisser de la barre d\'espace vers le haut</string>
     <string name="pref__gestures__space_bar_swipe_left__label" comment="Preference title">Glisser de la barre d\'espace vers la gauche</string>
     <string name="pref__gestures__space_bar_swipe_right__label" comment="Preference title">Glisser de la barre d\'espace vers la droite</string>
+    <string name="pref__gestures__space_bar_long_press__label" comment="Preference title">Appui long sur la barre d\'espace</string>
     <string name="pref__gestures__delete_key_swipe_left__label" comment="Preference title">Glisser de la touche de suppression vers la gauche</string>
     <string name="pref__gestures__swipe_velocity_threshold__label" comment="Preference title">Seuil de vitesse de glissement</string>
     <string name="pref__gestures__swipe_velocity_threshold__very_slow" comment="Preference value for swipe velocity threshold">Très lente</string>
@@ -203,6 +227,26 @@
     <string name="about__view_source_code" comment="Label of View source code button in About">Code source</string>
     <string name="about__license__title" comment="Title of Open-source licenses dialog">Licences de logiciels libres</string>
     <!-- Assets strings -->
+    <plurals name="assets__file__authors">
+        <item quantity="one">Auteur</item>
+        <item quantity="other">Auteurs</item>
+    </plurals>
+    <string name="assets__file__name">Nom</string>
+    <string name="assets__file__source">Source</string>
+    <string name="assets__action__add">Ajouter</string>
+    <string name="assets__action__cancel">Annuler</string>
+    <string name="assets__action__cancel_confirm_title">Confirmer l\'annulation</string>
+    <string name="assets__action__cancel_confirm_message">Êtes-vous sûrs de vouloir abandonner tout changement non sauvegardé ? Cette action ne peut être annulée après son exécution.</string>
+    <string name="assets__action__delete">Supprimer</string>
+    <string name="assets__action__delete_confirm_title">Confirmer la suppression</string>
+    <string name="assets__action__delete_confirm_message">Êtes-vous sûrs de vouloir supprimer « %s » ? Cette action ne peut être annulée après son exécution.</string>
+    <string name="assets__action__edit">Modifier</string>
+    <string name="assets__action__export">Exporter</string>
+    <string name="assets__action__import">Importer</string>
+    <string name="assets__action__no">Non</string>
+    <string name="assets__action__save">Sauvegarder</string>
+    <string name="assets__action__yes">Oui</string>
+    <string name="assets__error__invalid">Invalide</string>
     <!-- Setup UI strings -->
     <string name="setup__title" comment="Title of Setup">Configuration</string>
     <string name="setup__prev_button" comment="Label of Previous button in Setup (try to find a short translation due to limited space in UI)">Préc</string>

app/src/main/res/values-he/strings.xml

@@ -64,37 +64,13 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">תת הסוג הזה כבר קיים!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">ערכת נושא של המקלדת</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">לא מוגדר</string>
-    <string name="settings__theme__background" comment="General label for a background preference">צבע רקע</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">צבע הרקע כאשר מופעל</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">צבע הרקע כאשר מקש נלחץ</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">צבע רקע קדמי</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">צבע רקע קדמי (אלטרנטיבי)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">צבע קדמי (Caps lock)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">בחר צבע</string>
+    <string name="pref__theme__mode__always_day" comment="Preference value for theme mode">תמיד בהיר</string>
+    <string name="pref__theme__mode__always_night" comment="Preference value for theme mode">תמיד כהה</string>
     <string name="settings__theme__group_window" comment="Theme group label">חלון ומערכת</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">מקלדת</string>
     <string name="settings__theme__group_key" comment="Theme group label">מקש</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">מקש Enter</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">חלונית מקש</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">מקש Shift</string>
     <string name="settings__theme__group_media" comment="Theme group label">אזור המֶדְיָה</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">ביד אחת</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">כפתור יד אחת</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">מצב פרטיות</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">שורה חכמה</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">כפתור שורה חכמה</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">צבע ראשי</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">מיושם על לשונית המדיה העיקרית ועל סממן הבחירה</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">צבע ראשי (כהה)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">כרגע לא בשימוש, עם זאת שמור עבור מימוש עתידי</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">צבע הדגשה</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">מיושם על לשונית האימוג\'י</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">צבע סרגל הניווט</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">צבע הרקע של סרגל הניווט.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">סרגל ניווט בעל רקע קדמי כהה</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">הגדר דלוק עבור כהה או לחילופין כבוי עבור רקע קדמי בהיר.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">גבולות מקשים</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">הגדר דלוק כדי להציג גבולות מקשים או לחילופין כבוי כדי להחביא אותם</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">העדפות מקלדת</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">מקשים</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">שורת המספרים</string>
@@ -154,7 +130,6 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">הקלד מילה באמצעות החלקה של האצבע בין האותיות</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] הצד את שביל הגלישה</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">יעלם אחרי כל מילה</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">מחוות</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">ללא פעולה</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">מחיקת תווים בקפדנות</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">מחק מילה נוכחית</string>
@@ -203,6 +178,13 @@
     <string name="about__view_source_code" comment="Label of View source code button in About">קוד מקור</string>
     <string name="about__license__title" comment="Title of Open-source licenses dialog">רישיונות קוד פתוח</string>
     <!-- Assets strings -->
+    <string name="assets__action__delete">מחק</string>
+    <string name="assets__action__delete_confirm_title">אישור מחיקה</string>
+    <string name="assets__action__edit">ערוך</string>
+    <string name="assets__action__no">לא</string>
+    <string name="assets__action__save">שמור</string>
+    <string name="assets__action__yes">כן</string>
+    <string name="assets__error__invalid">לא תקין</string>
     <!-- Setup UI strings -->
     <string name="setup__title" comment="Title of Setup">הגדרות</string>
     <string name="setup__prev_button" comment="Label of Previous button in Setup (try to find a short translation due to limited space in UI)">הקודם</string>

app/src/main/res/values-hu/strings.xml

@@ -40,6 +40,7 @@
     <string name="settings__title" comment="Title of Settings">Beállítások</string>
     <string name="settings__menu" comment="Hint of top-right three-dot icon in Settings">További beállítások</string>
     <string name="settings__menu_help" comment="Three-dot menu entry for Help and Feedback web link">Segítség és visszajelzés</string>
+    <string name="settings__help" comment="General label for help buttons in Settings">Súgó</string>
     <string name="settings__navigation__home" comment="Long-press hint of bottom nav item Home in Settings">Kezdés</string>
     <string name="settings__navigation__keyboard" comment="Long-press hint of bottom nav item Keyboard in Settings">Billentyűzet</string>
     <string name="settings__navigation__typing" comment="Long-press hint of bottom nav item Typing in Settings">Gépelés</string>
@@ -64,42 +65,64 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Ez az altípus már létezik!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Billentyűzet téma</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Nem meghatározott</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Háttérszín</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Aktív háttérszín</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Lenyomott háttérszín</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Előtérszín</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Előtérszín (alternatív)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Előtérszín (caps lock)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Szín kiválasztása</string>
+    <string name="pref__theme__mode__label" comment="Label of the theme mode preference">Téma mód</string>
+    <string name="pref__theme__mode__always_day" comment="Preference value for theme mode">Mindig nappali</string>
+    <string name="pref__theme__mode__always_night" comment="Preference value for theme mode">Mindig éjszakai</string>
+    <string name="pref__theme__mode__follow_system" comment="Preference value for theme mode">Rendszertéma követése</string>
+    <string name="pref__theme__mode__follow_time" comment="Preference value for theme mode">Idő követése</string>
+    <string name="pref__theme__sunrise_time__label" comment="Label of the sunrise time preference">Napkelte ideje</string>
+    <string name="pref__theme__sunset_time__label" comment="Label of the sunset time preference">Napnyugta ideje</string>
+    <string name="pref__theme__day" comment="Label of the day group (day means light theme)">Nappali téma</string>
+    <string name="pref__theme__night" comment="Label of the night group (night means dark theme)">Éjszakai téma</string>
+    <string name="pref__theme__any_theme__label" comment="Label of the theme selector preference">Kiválasztott téma</string>
+    <string name="pref__theme__any_theme_adapt_to_app__label" comment="Label of the theme adapt to app preference">Színek módosítása az alkalmazáshoz</string>
+    <string name="pref__theme__any_theme_adapt_to_app__summary" comment="Summary of the theme adapt to app preference">Színek módosítása az alkalmazáshoz, ha a célalkalmazás támogatja.</string>
+    <string name="pref__theme__source_assets" comment="Label for the theme source field">FlorisBoard alkalmazás eszközök</string>
+    <string name="pref__theme__source_internal" comment="Label for the theme source field">Belső tárhely</string>
+    <string name="pref__theme__source_external" comment="Label for the theme source field">Külső szolgáltató</string>
+    <string name="settings__theme_manager__title_day" comment="Title of the theme manager activity for day theme">Témakezelő (nappali)</string>
+    <string name="settings__theme_manager__title_night" comment="Title of the theme manager activity for night theme">Témakezelő (éjszakai)</string>
+    <string name="settings__theme_manager__create_empty" comment="Label of the Create empty FAB action">Üres téma létrehozása</string>
+    <string name="settings__theme_manager__create_from_selected" comment="Label of the Create from selected FAB action">Létrehozás a kiválasztott témából</string>
+    <string name="settings__theme_manager__theme_custom_title" comment="Title template for a custom theme">Egyéni (ezen alapul: %s)</string>
+    <string name="settings__theme_manager__theme_new_title" comment="Title template for a new theme">Új téma</string>
+    <string name="settings__theme_editor__title" comment="Title of the edit theme activity">Téma szerkesztése</string>
+    <string name="settings__theme_editor__name_label" comment="Label of name input">Név</string>
+    <string name="settings__theme_editor__type_label" comment="Label of type input">Típus</string>
+    <string name="settings__theme_editor__add_group_dialog_title" comment="Title of the add group dialog in the theme editor">Csoport hozzáadása</string>
+    <string name="settings__theme_editor__edit_group_dialog_title" comment="Title of the edit group dialog in the theme editor">Csoport szerkesztése</string>
+    <string name="settings__theme_editor__add_attr_dialog_title" comment="Title of the add attribute dialog in the theme editor">Tulajdonság hozzáadása</string>
+    <string name="settings__theme_editor__edit_attr_dialog_title" comment="Title of the edit attribute dialog in the theme editor">Tulajdonság szerkesztése</string>
+    <string name="settings__theme_editor__value_type_reference" comment="Theme value type">Hivatkozás</string>
+    <string name="settings__theme_editor__value_type_reference_group" comment="Theme value type sub-field">Csoport</string>
+    <string name="settings__theme_editor__value_type_reference_attr" comment="Theme value type sub-field">Tulajdonság</string>
+    <string name="settings__theme_editor__value_type_solid_color" comment="Theme value type">Egyszínű</string>
+    <string name="settings__theme_editor__value_type_lin_grad" comment="Theme value type">Lineáris átmenet</string>
+    <string name="settings__theme_editor__value_type_rad_grad" comment="Theme value type">Sugaras átmenet</string>
+    <string name="settings__theme_editor__value_type_on_off" comment="Theme value type">Kapcsoló</string>
+    <string name="settings__theme_editor__value_type_on_off_state" comment="Theme value type sub-field">Állapot</string>
+    <string name="settings__theme_editor__value_type_other" comment="Theme value type">Egyéb</string>
+    <string name="settings__theme_editor__value_type_other_text" comment="Theme value type sub-field">Szöveg</string>
+    <string name="settings__theme_editor__value_preview_content_description" comment="Theme value preview content description">A téma értékének előnézete</string>
+    <string name="settings__theme_editor__error_theme_label_empty" comment="Error text for an empty theme label">Adjon meg egy témanevet.</string>
+    <string name="settings__theme_editor__error_group_name_empty" comment="Error text for an empty group name">Adjon meg egy csoportnevet.</string>
+    <string name="settings__theme_editor__error_attr_name" comment="Error text for an invalid attribute name">Adjon meg egy tulajdonságnevet, amely csak a-z és/vagy A-Z betűket tartalmaz.</string>
+    <string name="settings__theme_editor__error_attr_name_empty" comment="Error text for an empty attribute name">Adjon meg egy tulajdonságnevet.</string>
     <string name="settings__theme__group_window" comment="Theme group label">Ablak és rendszer</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Billentyűzet</string>
     <string name="settings__theme__group_key" comment="Theme group label">Billentyű</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Enter billentyű</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Felugró billentyű</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Shift billentyű</string>
     <string name="settings__theme__group_media" comment="Theme group label">Média kontextus</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">Egykezes</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">Egykezes gomb</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">Privát mód</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">Okossáv</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Okossáv gomb</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Elsődleges szín</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">Alkalmazva a fő média lapokra és a kiemelés színének</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Elsődleges szín (sötét)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">Jelenleg nincs használva, fenntartva jövőbeli megvalósításra</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Kiemelés színe</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">Alkalmazva az emoji lapokra</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Navigációs sáv színe</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">A navigációs sáv háttere.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">Navigációs sáv sötét előtér</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">Kapcsolja BE sötét, KI világos előtérszínhez.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">Billentyű szegélye</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">Kapcsolja BE a szegély megjelenítéséhez vagy KI az elrejtéséhez</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Billentyűzet beállítások</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Billentyűk</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">Számsor</string>
     <string name="pref__keyboard__number_row__summary" comment="Preference summary">Számsor megjelenítése a karakterelrendezés felett</string>
+    <string name="pref__keyboard__hinted_number_row_mode__label" comment="Preference title">Másodlagos számsor</string>
+    <string name="pref__keyboard__hinted_symbols_mode__label" comment="Preference title">Másodlagos szimbólumok</string>
     <string name="pref__keyboard__hint_mode__disabled" comment="Preference value">Letiltva</string>
+    <string name="pref__keyboard__hint_mode__enabled_hint_priority" comment="Preference value">Engedélyezve (a másodlagos szimbólumok először)</string>
+    <string name="pref__keyboard__hint_mode__enabled_accent_priority" comment="Preference value">Engedélyezve (az ékezetes szimbólumok először)</string>
+    <string name="pref__keyboard__hint_mode__enabled_smart_priority" comment="Preference value">Engedélyezve (intelligens eldöntés)</string>
     <string name="pref__keyboard__font_size_multiplier_portrait__label" comment="Preference title">Betűméret szorzó (álló)</string>
     <string name="pref__keyboard__font_size_multiplier_landscape__label" comment="Preference title">Betűméret szorzó (fekvő)</string>
     <string name="pref__keyboard__group_layout__label" comment="Preference group title">Elrendezés</string>
@@ -149,17 +172,23 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">Írjon be egy szót úgy, hogy ujját a betűin keresztülcsúsztatja</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] Nyomvonal megjelenítése</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">Minden szó után eltűnik</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Gesztusok</string>
+    <string name="pref__gestures__general_title" comment="Preference group title">Általános gesztusok</string>
+    <string name="pref__gestures__space_bar_title" comment="Preference group title">Szóköz gesztusok</string>
+    <string name="pref__gestures__other_title" comment="Preference group title">Egyéb gesztusok / gesztusküszöb</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Nincs művelet</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">Karakterek pontos törlése</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">A jelenlegi szó törlése</string>
     <string name="pref__gestures__swipe_action__delete_words_precisely" comment="Preference value for swipe action">Szavak pontos törlése</string>
     <string name="pref__gestures__swipe_action__hide_keyboard" comment="Preference value for swipe action">Billentyűzet elrejtése</string>
+    <string name="pref__gestures__swipe_action__insert_space" comment="Preference value for swipe action">Szóköz beszúrása</string>
     <string name="pref__gestures__swipe_action__move_cursor_up" comment="Preference value for swipe action">Kurzor mozgatása felfelé</string>
     <string name="pref__gestures__swipe_action__move_cursor_down" comment="Preference value for swipe action">Kurzor mozgatása lefelé</string>
     <string name="pref__gestures__swipe_action__move_cursor_left" comment="Preference value for swipe action">Kurzor mozgatása balra</string>
     <string name="pref__gestures__swipe_action__move_cursor_right" comment="Preference value for swipe action">Kurzor mozgatása jobbra</string>
+    <string name="pref__gestures__swipe_action__move_cursor_start_of_line" comment="Preference value for swipe action">Kurzor sor elejére helyezése</string>
+    <string name="pref__gestures__swipe_action__move_cursor_end_of_line" comment="Preference value for swipe action">Kurzor sor végére helyezése</string>
     <string name="pref__gestures__swipe_action__shift" comment="Preference value for swipe action">Shift</string>
+    <string name="pref__gestures__swipe_action__show_input_method_picker" comment="Preference value for swipe action">Bevitelválasztó megnyitása</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_keyboard" comment="Preference value for swipe action">Váltás az előző billentyűzetre</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_subtype" comment="Preference value for swipe action">Váltás az előző altípusra</string>
     <string name="pref__gestures__swipe_action__switch_to_next_subtype" comment="Preference value for swipe action">Váltás a következő altípusra</string>
@@ -170,6 +199,7 @@
     <string name="pref__gestures__space_bar_swipe_up__label" comment="Preference title">Szóköz felhúzás</string>
     <string name="pref__gestures__space_bar_swipe_left__label" comment="Preference title">Szóköz balra húzás</string>
     <string name="pref__gestures__space_bar_swipe_right__label" comment="Preference title">Szóköz jobbra húzás</string>
+    <string name="pref__gestures__space_bar_long_press__label" comment="Preference title">Szóköz hosszú lenyomása</string>
     <string name="pref__gestures__delete_key_swipe_left__label" comment="Preference title">Törlés gomb balra húzás</string>
     <string name="pref__gestures__swipe_velocity_threshold__label" comment="Preference title">Húzás sebesség küszöb</string>
     <string name="pref__gestures__swipe_velocity_threshold__very_slow" comment="Preference value for swipe velocity threshold">Nagyon lassú</string>
@@ -198,6 +228,22 @@
     <string name="about__view_source_code" comment="Label of View source code button in About">Forráskód</string>
     <string name="about__license__title" comment="Title of Open-source licenses dialog">Nyílt forráskódú licencek</string>
     <!-- Assets strings -->
+    <string name="assets__file__name">Név</string>
+    <string name="assets__file__source">Forrás</string>
+    <string name="assets__action__add">Hozzáadás</string>
+    <string name="assets__action__cancel">Mégse</string>
+    <string name="assets__action__cancel_confirm_title">Kilépés megerősítése</string>
+    <string name="assets__action__cancel_confirm_message">Biztosan törölni szeretne vetni minden mentetlen változtatást? Ezt a műveletet nem lehet visszavonni.</string>
+    <string name="assets__action__delete">Törlés</string>
+    <string name="assets__action__delete_confirm_title">Törlés megerősítése</string>
+    <string name="assets__action__delete_confirm_message">Biztosan törölni szeretné ezt \"%s\"? Ezt a műveletet nem lehet visszavonni.</string>
+    <string name="assets__action__edit">Szerkesztés</string>
+    <string name="assets__action__export">Exportálás</string>
+    <string name="assets__action__import">Importálás</string>
+    <string name="assets__action__no">Nem</string>
+    <string name="assets__action__save">Mentés</string>
+    <string name="assets__action__yes">Igen</string>
+    <string name="assets__error__invalid">Érvénytelen</string>
     <!-- Setup UI strings -->
     <string name="setup__title" comment="Title of Setup">Beállítás</string>
     <string name="setup__prev_button" comment="Label of Previous button in Setup (try to find a short translation due to limited space in UI)">Előző</string>

app/src/main/res/values-it/strings.xml

@@ -64,37 +64,11 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Questo stile di input esiste già !</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Tema tastiera</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Sconosciuto</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Colore di sfondo</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Colore di sfondo quando attivo</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Colore di sfondo quando premuto</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Colore di primo piano</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Colore di primo piano (alternativo)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Colore di primo piano (maiuscolo)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Seleziona un colore</string>
     <string name="settings__theme__group_window" comment="Theme group label">Finestra &amp; Sistema</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Tastiera</string>
     <string name="settings__theme__group_key" comment="Theme group label">Tasto</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Inserisci tasto</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Popup tasto</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Tasto Shift</string>
     <string name="settings__theme__group_media" comment="Theme group label">Contesto multimediale</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">Una mano</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">Pulsante una mano</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">Modalità Privata</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">Smartbar</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Pulsante smartbar</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Colore primario</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">Applicato alla tab principale e alla selezione</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Colore primario (scuro)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">Attualmente non utilizzato, riservato per implementazioni future</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Colore di accento</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">Applicato alla tab delle emoji</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Colore della barra di navigazione</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">Il colore di sfondo della barra di navigazione.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">Colore scuro di primo piano della barra di navigazione</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">Imposta a ON per un colore di primo piano scuro e OFF per uno chiaro.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">Bordo dei tasti</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">Imposta a ON per mostrare il bordo e ad OFF per nasconderlo</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Tastiera preferenze</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Tasti</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">Barra numerica</string>
@@ -154,7 +128,6 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">Scrivi una parola facendo scivolare il dito sulle lettere che la compongono</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] Mostra scia dello swype</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">Scomparirà dopo ogni parola</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Gesti</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Nessuna azione</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">Cancella lettere con precisione</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">Cancella la parola attuale</string>

app/src/main/res/values-ku/strings.xml

@@ -40,6 +40,7 @@
     <string name="settings__title" comment="Title of Settings">ڕێکخستنەکان</string>
     <string name="settings__menu" comment="Hint of top-right three-dot icon in Settings">هەڵبژاردنی زیاتر</string>
     <string name="settings__menu_help" comment="Three-dot menu entry for Help and Feedback web link">یارمەتی و فێرکاری</string>
+    <string name="settings__help" comment="General label for help buttons in Settings">یارمەتی</string>
     <string name="settings__navigation__home" comment="Long-press hint of bottom nav item Home in Settings">سەرەتا</string>
     <string name="settings__navigation__keyboard" comment="Long-press hint of bottom nav item Keyboard in Settings">تەختەکلیل</string>
     <string name="settings__navigation__typing" comment="Long-press hint of bottom nav item Typing in Settings">نووسین</string>
@@ -104,41 +105,14 @@
     <string name="settings__theme_editor__value_type_other_text" comment="Theme value type sub-field">نوسین</string>
     <string name="settings__theme_editor__value_preview_content_description" comment="Theme value preview content description">ڕێژەی پیشاندانی ڕووکار</string>
     <string name="settings__theme_editor__error_theme_label_empty" comment="Error text for an empty theme label">تکایە ناوی ڕووکار بنوسە</string>
-    <string name="settings__theme_editor__error_group_name" comment="Error text for an invalid group name">تکایە ناوی گروپ بنووسە کە تەنها پیتەکانی a-z و/یان A-Z ی تێدا بێت.</string>
     <string name="settings__theme_editor__error_group_name_empty" comment="Error text for an empty group name">تکایە ناوی گرووپ بنوسە</string>
     <string name="settings__theme_editor__error_attr_name" comment="Error text for an invalid attribute name">تکایە ناوی تایبەتمەندی بنووسە کە تەنها پیتەکانی a-z و/یان A-Z ی تێدا بێت.</string>
     <string name="settings__theme_editor__error_attr_name_empty" comment="Error text for an empty attribute name">تکایە ناوی تایبەتمەندی بنوسە</string>
-    <string name="settings__theme__background" comment="General label for a background preference">ڕەنگی پشتتەوە</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">ڕەنگی پشت شاشە لەکاتی چالاکبوندا</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">ڕەنگی پشت شاشە لەکاتی دەستلێدان</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">ڕەنگی پێشەوە</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">ڕەنگی پێشەوە (جێگرەوە)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">ڕەنگی پێشەوە (قوفڵی caps)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">ڕەنگێک هەڵبژێرە</string>
     <string name="settings__theme__group_window" comment="Theme group label">ڕووکەش</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">تەختەکلیل</string>
     <string name="settings__theme__group_key" comment="Theme group label">دوگمە</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">دوگمەی ئینتەر</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">دوگمەی بچوککراوە</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">دوگمەی شێفت</string>
     <string name="settings__theme__group_media" comment="Theme group label">لیستی میدیا</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">بەکارهێنان بە یەک دەست</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">دوگمەی بەکارهێنانی یەک دەست</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">دۆخی تایبەت</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">ڕەنگی بەشی سەرەوە</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">ڕەنگی دوگمەکانی بەشی سەرەوە</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">ڕەنگی بنەڕەتی</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">جێبەجێ کراوە بۆ بەشی میدیای سەرەکی شەپۆل و تیشکخستنەسەر هەڵبژاردنەکان</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">ڕەنگی بنەڕەتی (تاریک)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">لە ئێستادا بەردەست نییە، دنراوە بۆ جێبەجێکردنی داهاتوو</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">ڕەنگی دووەم</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">جێبەجێ کراوە بۆ بەشی خەندەکان</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">ڕەنگی بەشی خوارەوە</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">پشت شاشەی بەشی خوارەوە</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">پشت شاشەی تاریکی بەشی خوارەوە</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">بۆ تاریک کردن یان بۆ کوژاندنەوەی بۆ ڕووناککردنی پێشگرەکە</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">لێواری دوگمەکان</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">چالاککردن واتە پیشاندانی لێوار یان نا چالاک نۆ شاردنەوە</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">ڕێکخستنی تەختەکلیل</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">دوگمەکان</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">لیستی ژمارەکان</string>
@@ -198,17 +172,23 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">نووسین بەسەریەکەوە بەشێوەی دەسخشاندن بەسەر پیتەکاندا</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] پیشاندانی هێڵی نووسین</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">لەدوای هەر ووشەیەک دەردەکەوێ</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">ئاماژەکان</string>
+    <string name="pref__gestures__general_title" comment="Preference group title">ئاماژژە گشتییەکان</string>
+    <string name="pref__gestures__space_bar_title" comment="Preference group title">ئاماژەی دوگمەی بۆشایی</string>
+    <string name="pref__gestures__other_title" comment="Preference group title">ئاماژەکانی/فرمانەکانی تر</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">هیچ فرمانێک</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">سڕینەوەی پیتەکان یەک بە یەک</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">سڕینەوەی ووشەی ئێستا</string>
     <string name="pref__gestures__swipe_action__delete_words_precisely" comment="Preference value for swipe action">سڕینەوەی ووشەکان یەک بە یەک</string>
     <string name="pref__gestures__swipe_action__hide_keyboard" comment="Preference value for swipe action">شاردنەوەی تەختەکلیل</string>
+    <string name="pref__gestures__swipe_action__insert_space" comment="Preference value for swipe action">زیادکردنی ماوە</string>
     <string name="pref__gestures__swipe_action__move_cursor_up" comment="Preference value for swipe action">بردن بۆ سەرەوە</string>
     <string name="pref__gestures__swipe_action__move_cursor_down" comment="Preference value for swipe action">بردن بۆ خوارەوە</string>
     <string name="pref__gestures__swipe_action__move_cursor_left" comment="Preference value for swipe action">بردن بۆ لای چەپ</string>
     <string name="pref__gestures__swipe_action__move_cursor_right" comment="Preference value for swipe action">بردن بۆ لای ڕاست</string>
+    <string name="pref__gestures__swipe_action__move_cursor_start_of_line" comment="Preference value for swipe action">چوون بۆ سەرەتای ڕستە</string>
+    <string name="pref__gestures__swipe_action__move_cursor_end_of_line" comment="Preference value for swipe action">چوون بۆ کۆتایی ڕستە</string>
     <string name="pref__gestures__swipe_action__shift" comment="Preference value for swipe action">گەورەکردن (Shift) </string>
+    <string name="pref__gestures__swipe_action__show_input_method_picker" comment="Preference value for swipe action">گۆڕینی تەختەکلیل</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_keyboard" comment="Preference value for swipe action">گۆڕین بۆ تەختەکلیلی پێشوو</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_subtype" comment="Preference value for swipe action">گۆڕین بۆ زمانی پێشوو</string>
     <string name="pref__gestures__swipe_action__switch_to_next_subtype" comment="Preference value for swipe action">گۆڕین بۆ زمانی دواتر</string>
@@ -219,6 +199,7 @@
     <string name="pref__gestures__space_bar_swipe_up__label" comment="Preference title">دوگمەی بۆشایی بۆ سەرەوە</string>
     <string name="pref__gestures__space_bar_swipe_left__label" comment="Preference title">دوگمەی بۆشایی بۆ لای چەپ</string>
     <string name="pref__gestures__space_bar_swipe_right__label" comment="Preference title">دوگمەی بۆشایی بۆ لای ڕاست</string>
+    <string name="pref__gestures__space_bar_long_press__label" comment="Preference title">دوگمەی بۆشایی لەکاتی دەستڕاگرتن</string>
     <string name="pref__gestures__delete_key_swipe_left__label" comment="Preference title">دوگمەی سڕینەوە بۆ لای چەپ</string>
     <string name="pref__gestures__swipe_velocity_threshold__label" comment="Preference title">ئاستی خێرایی ڕاکێشان</string>
     <string name="pref__gestures__swipe_velocity_threshold__very_slow" comment="Preference value for swipe velocity threshold">خاوترین</string>

app/src/main/res/values-nl/strings.xml

@@ -40,6 +40,7 @@
     <string name="settings__title" comment="Title of Settings">Instellingen</string>
     <string name="settings__menu" comment="Hint of top-right three-dot icon in Settings">Meer opties</string>
     <string name="settings__menu_help" comment="Three-dot menu entry for Help and Feedback web link">Help &amp; feedback</string>
+    <string name="settings__help" comment="General label for help buttons in Settings">Help</string>
     <string name="settings__navigation__home" comment="Long-press hint of bottom nav item Home in Settings">Startscherm</string>
     <string name="settings__navigation__keyboard" comment="Long-press hint of bottom nav item Keyboard in Settings">Toetsenbord</string>
     <string name="settings__navigation__typing" comment="Long-press hint of bottom nav item Typing in Settings">Typen</string>
@@ -64,37 +65,55 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Deze indeling bestaat al!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Toetsenbordthema</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Ongedefinieerd</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Achtergrondkleur</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Achtergrondkleur wanneer actief</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Achtergrondkleur wanneer ingedrukt</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Voorgrondkleur</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Voorgrondkleur (alternatief)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Voorgrondkleur (CapsLock)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Selecteer een kleur</string>
+    <string name="pref__theme__mode__label" comment="Label of the theme mode preference">Thema modus</string>
+    <string name="pref__theme__mode__always_day" comment="Preference value for theme mode">Altijd dag</string>
+    <string name="pref__theme__mode__always_night" comment="Preference value for theme mode">Altijd nacht</string>
+    <string name="pref__theme__mode__follow_system" comment="Preference value for theme mode">Volg systeeminstelling</string>
+    <string name="pref__theme__mode__follow_time" comment="Preference value for theme mode">Volg tijd</string>
+    <string name="pref__theme__sunrise_time__label" comment="Label of the sunrise time preference">Zonsopgang</string>
+    <string name="pref__theme__sunset_time__label" comment="Label of the sunset time preference">Zonsondergang</string>
+    <string name="pref__theme__day" comment="Label of the day group (day means light theme)">Dagthema</string>
+    <string name="pref__theme__night" comment="Label of the night group (night means dark theme)">Nachtthema</string>
+    <string name="pref__theme__any_theme__label" comment="Label of the theme selector preference">Geselecteerd thema</string>
+    <string name="pref__theme__any_theme_adapt_to_app__label" comment="Label of the theme adapt to app preference">Pas kleuren aan naar app</string>
+    <string name="pref__theme__any_theme_adapt_to_app__summary" comment="Summary of the theme adapt to app preference">Themakleuren aanpassen naar die van de actieve app, als de doelapp dit ondersteunt.</string>
+    <string name="pref__theme__source_assets" comment="Label for the theme source field">Florisboard Apponderdelen</string>
+    <string name="pref__theme__source_internal" comment="Label for the theme source field">Interne opslag</string>
+    <string name="pref__theme__source_external" comment="Label for the theme source field">Gebruik externe provider</string>
+    <string name="settings__theme_manager__title_day" comment="Title of the theme manager activity for day theme">Themamanager (Dag)</string>
+    <string name="settings__theme_manager__title_night" comment="Title of the theme manager activity for night theme">Themamanager (Nacht)</string>
+    <string name="settings__theme_manager__create_empty" comment="Label of the Create empty FAB action">Nieuw thema maken</string>
+    <string name="settings__theme_manager__create_from_selected" comment="Label of the Create from selected FAB action">Maak op basis van gekozen thema</string>
+    <string name="settings__theme_manager__theme_custom_title" comment="Title template for a custom theme">Aangepast (gebaseerd op %s)</string>
+    <string name="settings__theme_manager__theme_new_title" comment="Title template for a new theme">Nieuw thema</string>
+    <string name="settings__theme_editor__title" comment="Title of the edit theme activity">Thema bewerken</string>
+    <string name="settings__theme_editor__name_label" comment="Label of name input">Naam</string>
+    <string name="settings__theme_editor__type_label" comment="Label of type input">Type</string>
+    <string name="settings__theme_editor__add_group_dialog_title" comment="Title of the add group dialog in the theme editor">Groep toevoegen</string>
+    <string name="settings__theme_editor__edit_group_dialog_title" comment="Title of the edit group dialog in the theme editor">Bewerk groep</string>
+    <string name="settings__theme_editor__add_attr_dialog_title" comment="Title of the add attribute dialog in the theme editor">Kenmerk toevoegen</string>
+    <string name="settings__theme_editor__edit_attr_dialog_title" comment="Title of the edit attribute dialog in the theme editor">Kenmerken bewerken</string>
+    <string name="settings__theme_editor__value_type_reference" comment="Theme value type">Referentie</string>
+    <string name="settings__theme_editor__value_type_reference_group" comment="Theme value type sub-field">Groep</string>
+    <string name="settings__theme_editor__value_type_reference_attr" comment="Theme value type sub-field">Kenmerk</string>
+    <string name="settings__theme_editor__value_type_solid_color" comment="Theme value type">Effen kleur</string>
+    <string name="settings__theme_editor__value_type_lin_grad" comment="Theme value type">Lineair kleurverloop</string>
+    <string name="settings__theme_editor__value_type_rad_grad" comment="Theme value type">Radiaal kleurverloop</string>
+    <string name="settings__theme_editor__value_type_on_off" comment="Theme value type">Wissel</string>
+    <string name="settings__theme_editor__value_type_on_off_state" comment="Theme value type sub-field">Status</string>
+    <string name="settings__theme_editor__value_type_other" comment="Theme value type">Overige</string>
+    <string name="settings__theme_editor__value_type_other_text" comment="Theme value type sub-field">Tekst</string>
+    <string name="settings__theme_editor__value_preview_content_description" comment="Theme value preview content description">Voorbeeld van de themawaarde</string>
+    <string name="settings__theme_editor__error_theme_label_empty" comment="Error text for an empty theme label">Voer een naam voor het thema in.</string>
+    <string name="settings__theme_editor__error_group_name" comment="Error text for an invalid group name">Voer een groepsnaam in die enkel letters (a-z en/of A-Z), dubbelpunt (:) voor ondergroepering of bijkomend nummers (0-9), tilde (~) of underscores (_) voor het sleutellabel bevat.</string>
+    <string name="settings__theme_editor__error_group_name_empty" comment="Error text for an empty group name">Vul een groepsnaam in.</string>
+    <string name="settings__theme_editor__error_attr_name" comment="Error text for an invalid attribute name">Vul een kenmerknaam in die enkel de letters a-z en/of A-Z bevat.</string>
+    <string name="settings__theme_editor__error_attr_name_empty" comment="Error text for an empty attribute name">Vul de naam van het kenmerk in.</string>
     <string name="settings__theme__group_window" comment="Theme group label">Venster &amp; Systeem</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Toetsenbord</string>
     <string name="settings__theme__group_key" comment="Theme group label">Toets</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Entertoets</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Sleutel pop-up</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Shift</string>
     <string name="settings__theme__group_media" comment="Theme group label">Mediacontext</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">Met één hand</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">Knop met één hand</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">Privémodus</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">Slimme Balk</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Slimme Balk bewerken</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Hoofdkleur</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">Toegepast op de hoofd Media tab-aanduiding en selectiemarkering</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Primaire kleur (Donker)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">Momenteel niet gebruikt, gereserveerd voor toekomstige implementatie</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Accentkleur</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">Toegepast op emoji tab-aanduiding</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Kleur navigatiebalk</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">De achtergrondkleur van de navigatiebalk.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">Navigatiebalk donkere voorgrond</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">Zet AAN voor donkere of UIT voor lichte voorgrond.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">Knoprand</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">Zet AAN om de knoprand te tonen of UIT om te verbergen</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Toetsenbordvoorkeuren</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Toetsen</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">Nummerrij</string>
@@ -154,17 +173,23 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">Typ een woord door je vinger over de letters te vegen</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] Veegspoor tonen</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">Verdwijnt na elk woord</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Gebaren</string>
+    <string name="pref__gestures__general_title" comment="Preference group title">Algemene gebaren</string>
+    <string name="pref__gestures__space_bar_title" comment="Preference group title">Spatiebalkgebaren</string>
+    <string name="pref__gestures__other_title" comment="Preference group title">Andere gebaren / Drempelwaardes voor gebaren</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Geen actie</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">Tekens nauwkeurig verwijderen</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">Huidige woord verwijderen</string>
     <string name="pref__gestures__swipe_action__delete_words_precisely" comment="Preference value for swipe action">Woorden nauwkeurig verwijderen</string>
     <string name="pref__gestures__swipe_action__hide_keyboard" comment="Preference value for swipe action">Toetsenbord verbergen</string>
+    <string name="pref__gestures__swipe_action__insert_space" comment="Preference value for swipe action">Spatie invoegen</string>
     <string name="pref__gestures__swipe_action__move_cursor_up" comment="Preference value for swipe action">Cursor naar boven verplaatsen</string>
     <string name="pref__gestures__swipe_action__move_cursor_down" comment="Preference value for swipe action">Cursor naar beneden verplaatsen</string>
     <string name="pref__gestures__swipe_action__move_cursor_left" comment="Preference value for swipe action">Cursor naar links verplaatsen</string>
     <string name="pref__gestures__swipe_action__move_cursor_right" comment="Preference value for swipe action">Cursor naar rechts verplaatsen</string>
+    <string name="pref__gestures__swipe_action__move_cursor_start_of_line" comment="Preference value for swipe action">Cursor aan het begin van de regel plaatsen</string>
+    <string name="pref__gestures__swipe_action__move_cursor_end_of_line" comment="Preference value for swipe action">Cursor aan het einde van de regel plaatsen</string>
     <string name="pref__gestures__swipe_action__shift" comment="Preference value for swipe action">Shift</string>
+    <string name="pref__gestures__swipe_action__show_input_method_picker" comment="Preference value for swipe action">Invoermethodekiezer weergeven</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_keyboard" comment="Preference value for swipe action">Overschakelen naar het vorige toetsenbord</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_subtype" comment="Preference value for swipe action">Overschakelen naar de vorige indeling</string>
     <string name="pref__gestures__swipe_action__switch_to_next_subtype" comment="Preference value for swipe action">Overschakelen naar de volgende indeling</string>
@@ -175,6 +200,7 @@
     <string name="pref__gestures__space_bar_swipe_up__label" comment="Preference title">Swipe omhoog vanop de spatiebalk</string>
     <string name="pref__gestures__space_bar_swipe_left__label" comment="Preference title">Swipe naar links vanop de spatiebalk</string>
     <string name="pref__gestures__space_bar_swipe_right__label" comment="Preference title">Swipe naar rechts vanop de spatiebalk</string>
+    <string name="pref__gestures__space_bar_long_press__label" comment="Preference title">Spatiebalk lang indrukken</string>
     <string name="pref__gestures__delete_key_swipe_left__label" comment="Preference title">Swipe naar links vanop de Delete-toets</string>
     <string name="pref__gestures__swipe_velocity_threshold__label" comment="Preference title">Drempelwaarde voor swipe-snelheid</string>
     <string name="pref__gestures__swipe_velocity_threshold__very_slow" comment="Preference value for swipe velocity threshold">Heel langzaam</string>
@@ -203,6 +229,26 @@
     <string name="about__view_source_code" comment="Label of View source code button in About">Broncode</string>
     <string name="about__license__title" comment="Title of Open-source licenses dialog">Open-source licenties</string>
     <!-- Assets strings -->
+    <plurals name="assets__file__authors">
+        <item quantity="one">Auteur</item>
+        <item quantity="other">Auteurs</item>
+    </plurals>
+    <string name="assets__file__name">Naam</string>
+    <string name="assets__file__source">Bron</string>
+    <string name="assets__action__add">Toevoegen</string>
+    <string name="assets__action__cancel">Annuleren</string>
+    <string name="assets__action__cancel_confirm_title">Annuleren bevestigen</string>
+    <string name="assets__action__cancel_confirm_message">Weet je zeker dat je onopgeslagen wijzigingen wil verwerpen? Deze actie kan niet ongedaan gemaakt worden.</string>
+    <string name="assets__action__delete">Verwijderen</string>
+    <string name="assets__action__delete_confirm_title">Verwijderen bevestigen</string>
+    <string name="assets__action__delete_confirm_message">Weet je zeker dat je %s wil verwijderen? Deze actie kan niet ongedaan gemaakt worden.</string>
+    <string name="assets__action__edit">Bewerken</string>
+    <string name="assets__action__export">Exporteren</string>
+    <string name="assets__action__import">Importeren</string>
+    <string name="assets__action__no">Nee</string>
+    <string name="assets__action__save">Opslaan</string>
+    <string name="assets__action__yes">Ja</string>
+    <string name="assets__error__invalid">Ongeldig</string>
     <!-- Setup UI strings -->
     <string name="setup__title" comment="Title of Setup">Setup</string>
     <string name="setup__prev_button" comment="Label of Previous button in Setup (try to find a short translation due to limited space in UI)">Vorige</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -2,7 +2,7 @@
 <resources>
     <string name="key__phone_pause" comment="Label for the Pause key in the telephone keyboard layout">Pausar</string>
     <string name="key__phone_wait" comment="Label for the Wait key in the telephone keyboard layout">Esperar</string>
-    <string name="key_popup__threedots_alt" comment="Content description for the three-dots icon in a key popup">Ícone de três pontos. Se mostrado, indica que mais letras podem ser usadas ao apertar e segurar a tecla.</string>
+    <string name="key_popup__threedots_alt" comment="Content description for the three-dots icon in a key popup">Ícone de três pontos. Se mostrado, indica que mais letras podem ser usadas ao pressionar e segurar a tecla.</string>
     <!-- One-handed strings -->
     <string name="one_handed__close_btn_content_description" comment="Content description for the one-handed close button">Fechar o modo uma mão.</string>
     <string name="one_handed__move_start_btn_content_description" comment="Content description for the one-handed move to left button">Mover teclado para a esquerda.</string>
@@ -40,6 +40,7 @@
     <string name="settings__title" comment="Title of Settings">Configurações</string>
     <string name="settings__menu" comment="Hint of top-right three-dot icon in Settings">Mais opções</string>
     <string name="settings__menu_help" comment="Three-dot menu entry for Help and Feedback web link">Ajuda &amp; feedback</string>
+    <string name="settings__help" comment="General label for help buttons in Settings">Ajuda</string>
     <string name="settings__navigation__home" comment="Long-press hint of bottom nav item Home in Settings">Início</string>
     <string name="settings__navigation__keyboard" comment="Long-press hint of bottom nav item Keyboard in Settings">Teclado</string>
     <string name="settings__navigation__typing" comment="Long-press hint of bottom nav item Typing in Settings">Digitação</string>
@@ -64,37 +65,78 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Este formato de digitação já existe!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Tema do teclado</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Indefinido</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Cor do plano de fundo</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Cor do plano de fundo quando ativa</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Cor do plano fundo quando pressionada</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Cor do primeiro plano</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Cor do primeiro plano (alternativa)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Cor do primeiro plano (caps lock)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Selecionar uma cor</string>
+    <string name="pref__theme__mode__label" comment="Label of the theme mode preference">Modo do tema</string>
+    <string name="pref__theme__mode__always_day" comment="Preference value for theme mode">Sempre dia</string>
+    <string name="pref__theme__mode__always_night" comment="Preference value for theme mode">Sempre noite</string>
+    <string name="pref__theme__mode__follow_system" comment="Preference value for theme mode">Seguir o sistema</string>
+    <string name="pref__theme__mode__follow_time" comment="Preference value for theme mode">Seguir a hora</string>
+    <string name="pref__theme__sunrise_time__label" comment="Label of the sunrise time preference">Hora do nascer do sol</string>
+    <string name="pref__theme__sunset_time__label" comment="Label of the sunset time preference">Hora do pôr do sol</string>
+    <string name="pref__theme__day" comment="Label of the day group (day means light theme)">Tema diurno</string>
+    <string name="pref__theme__night" comment="Label of the night group (night means dark theme)">Tema noturno</string>
+    <string name="pref__theme__any_theme__label" comment="Label of the theme selector preference">Tema selecionado</string>
+    <string name="pref__theme__any_theme_adapt_to_app__label" comment="Label of the theme adapt to app preference">Adaptar cores ao aplicativo</string>
+    <string name="pref__theme__any_theme_adapt_to_app__summary" comment="Summary of the theme adapt to app preference">As cores do tema se adaptam às do aplicativo atual, se o aplicativo de destino suportar isso.</string>
+    <string name="pref__theme__source_assets" comment="Label for the theme source field">Assets do Aplicativo FlorisBoard</string>
+    <string name="pref__theme__source_internal" comment="Label for the theme source field">Armazenamento Interno</string>
+    <string name="pref__theme__source_external" comment="Label for the theme source field">Provedor Externo</string>
+    <string name="settings__theme_manager__title_day" comment="Title of the theme manager activity for day theme">Gerenciador de Temas (Dia)</string>
+    <string name="settings__theme_manager__title_night" comment="Title of the theme manager activity for night theme">Gerenciador de Temas (Noite)</string>
+    <string name="settings__theme_manager__create_empty" comment="Label of the Create empty FAB action">Criar tema vazio</string>
+    <string name="settings__theme_manager__create_from_selected" comment="Label of the Create from selected FAB action">Criar a partir do tema selecionado</string>
+    <string name="settings__theme_manager__theme_custom_title" comment="Title template for a custom theme">Personalizado (baseado no %s)</string>
+    <string name="settings__theme_manager__theme_new_title" comment="Title template for a new theme">Novo tema</string>
+    <string name="settings__theme_editor__title" comment="Title of the edit theme activity">Editar tema</string>
+    <string name="settings__theme_editor__name_label" comment="Label of name input">Nome</string>
+    <string name="settings__theme_editor__type_label" comment="Label of type input">Tipo</string>
+    <string name="settings__theme_editor__add_group_dialog_title" comment="Title of the add group dialog in the theme editor">Adicionar grupo</string>
+    <string name="settings__theme_editor__edit_group_dialog_title" comment="Title of the edit group dialog in the theme editor">Editar grupo</string>
+    <string name="settings__theme_editor__add_attr_dialog_title" comment="Title of the add attribute dialog in the theme editor">Adicionar atributo</string>
+    <string name="settings__theme_editor__edit_attr_dialog_title" comment="Title of the edit attribute dialog in the theme editor">Editar atributo</string>
+    <string name="settings__theme_editor__value_type_reference" comment="Theme value type">Referência</string>
+    <string name="settings__theme_editor__value_type_reference_group" comment="Theme value type sub-field">Grupo</string>
+    <string name="settings__theme_editor__value_type_reference_attr" comment="Theme value type sub-field">Atributo</string>
+    <string name="settings__theme_editor__value_type_solid_color" comment="Theme value type">Cor sólida</string>
+    <string name="settings__theme_editor__value_type_lin_grad" comment="Theme value type">Gradiente linear</string>
+    <string name="settings__theme_editor__value_type_rad_grad" comment="Theme value type">Gradiente radial</string>
+    <string name="settings__theme_editor__value_type_on_off" comment="Theme value type">Interruptor</string>
+    <string name="settings__theme_editor__value_type_on_off_state" comment="Theme value type sub-field">Estado</string>
+    <string name="settings__theme_editor__value_type_other" comment="Theme value type">Outro</string>
+    <string name="settings__theme_editor__value_type_other_text" comment="Theme value type sub-field">Texto</string>
+    <string name="settings__theme_editor__value_preview_content_description" comment="Theme value preview content description">Pré-visualização do valor do tema</string>
+    <string name="settings__theme_editor__error_theme_label_empty" comment="Error text for an empty theme label">Por favor, digite um nome para o tema.</string>
+    <string name="settings__theme_editor__error_group_name" comment="Error text for an invalid group name">Digite um nome de grupo que contenha apenas letras (a-z e/ou A-Z), dois pontos (:) para subcodificar ou adicionalmente números (0-9), til (~) e sublinha (_) para o rótulo da tecla.</string>
+    <string name="settings__theme_editor__error_group_name_empty" comment="Error text for an empty group name">Digite um nome de grupo.</string>
+    <string name="settings__theme_editor__error_group_name_already_exists" comment="Error text for a duplicate group name">Esse nome de grupo já existe dentro deste tema. Por favor, escolha outro.</string>
+    <string name="settings__theme_editor__error_attr_name" comment="Error text for an invalid attribute name">Digite um nome de atributo que contenha apenas as letras a-z e/ou A-Z.</string>
+    <string name="settings__theme_editor__error_attr_name_empty" comment="Error text for an empty attribute name">Por favor, digite um nome para o atributo.</string>
+    <string name="settings__theme_editor__error_attr_name_already_exists" comment="Error text for a duplicate attribute name">Esse nome de atributo já existe dentro deste grupo. Por favor, especifique outro.</string>
     <string name="settings__theme__group_window" comment="Theme group label">Janela &amp; Sistema</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Teclado</string>
     <string name="settings__theme__group_key" comment="Theme group label">Tecla</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Tecla Enter</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Popup da tecla</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Tecla Shift</string>
+    <string name="settings__theme__group_key_specific" comment="Theme group label (%s is specific modifier)">Tecla (%s)</string>
     <string name="settings__theme__group_media" comment="Theme group label">Contexto de mídia</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">Modo uma mão</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">Botões do modo uma mão</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">Modo privado</string>
+    <string name="settings__theme__group_oneHanded" comment="Theme group label">Uma mão</string>
+    <string name="settings__theme__group_popup" comment="Theme group label">Popup</string>
+    <string name="settings__theme__group_privateMode" comment="Theme group label">Modo privado</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">Barra inteligente</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Botão da barra inteligente</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Cor primária</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">Aplicado à barra de indicação da aba de mídia principal e destaque de seleção</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Cor primária (escuro)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">Atualmente não utilizado, reservado para implementação futura</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Cor de destaque</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">Aplicado à barra de indicação da aba emoji</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Cor da barra de navegação</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">O plano de fundo da barra de navegação.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">Barra de navegação escura em primeiro plano</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">Ligue para escurecer ou desligue para clarear o primeiro plano.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">Borda das Teclas</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">Ligue para mostrar as bordas e desligue para ocultá-las</string>
+    <string name="settings__theme__group_smartbarButton" comment="Theme group label">Botão da barra inteligente</string>
+    <string name="settings__theme__group_custom" comment="Theme group label (%s is custom group name)">Grupo personalizado (%s)</string>
+    <string name="settings__theme__attr_background" comment="Theme attribute label">Cor do plano de fundo</string>
+    <string name="settings__theme__attr_backgroundActive" comment="Theme attribute label">Cor do plano de fundo (ativa)</string>
+    <string name="settings__theme__attr_backgroundPressed" comment="Theme attribute label">Cor do plano de fundo (pressionada)</string>
+    <string name="settings__theme__attr_foreground" comment="Theme attribute label">Cor do primeiro plano</string>
+    <string name="settings__theme__attr_foregroundAlt" comment="Theme attribute label">Cor do primeiro plano (alternativa)</string>
+    <string name="settings__theme__attr_foregroundPressed" comment="Theme attribute label">Cor do primeiro plano (pressionada)</string>
+    <string name="settings__theme__attr_showBorder" comment="Theme attribute label">Mostrar bordas</string>
+    <string name="settings__theme__attr_colorPrimary" comment="Theme attribute label">Cor primária</string>
+    <string name="settings__theme__attr_colorPrimaryDark" comment="Theme attribute label">Cor primária (escuro)</string>
+    <string name="settings__theme__attr_colorAccent" comment="Theme attribute label">Cor de destaque</string>
+    <string name="settings__theme__attr_navBarColor" comment="Theme attribute label">Cor da barra de navegação</string>
+    <string name="settings__theme__attr_navBarLight" comment="Theme attribute label">Barra de navegação escura em primeiro plano</string>
+    <string name="settings__theme__attr_semiTransparentColor" comment="Theme attribute label">Cor semi transparente</string>
+    <string name="settings__theme__attr_textColor" comment="Theme attribute label">Cor do texto</string>
+    <string name="settings__theme__attr_custom" comment="Theme attribute label (%s is custom attribute name)">Atributo personalizado (%s)</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Preferências do Teclado</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Teclas</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">Linha de números</string>
@@ -154,17 +196,23 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">Digitar uma palavra deslizando o dedo através de suas letras</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] Mostrar trilha de deslizamento</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">Desaparecerá após cada palavra</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Gestos</string>
+    <string name="pref__gestures__general_title" comment="Preference group title">Gestos gerais</string>
+    <string name="pref__gestures__space_bar_title" comment="Preference group title">Gestos da barra de espaço</string>
+    <string name="pref__gestures__other_title" comment="Preference group title">Outros gestos / Limites dos gestos</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Nenhuma ação</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">Excluir caracteres com precisão</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">Excluir palavra atual</string>
     <string name="pref__gestures__swipe_action__delete_words_precisely" comment="Preference value for swipe action">Excluir palavras com precisão</string>
     <string name="pref__gestures__swipe_action__hide_keyboard" comment="Preference value for swipe action">Esconder teclado</string>
+    <string name="pref__gestures__swipe_action__insert_space" comment="Preference value for swipe action">Inserir espaço</string>
     <string name="pref__gestures__swipe_action__move_cursor_up" comment="Preference value for swipe action">Mover cursor para cima</string>
     <string name="pref__gestures__swipe_action__move_cursor_down" comment="Preference value for swipe action">Mover cursor para baixo</string>
     <string name="pref__gestures__swipe_action__move_cursor_left" comment="Preference value for swipe action">Mover cursor para esquerda</string>
     <string name="pref__gestures__swipe_action__move_cursor_right" comment="Preference value for swipe action">Mover cursor para direita</string>
+    <string name="pref__gestures__swipe_action__move_cursor_start_of_line" comment="Preference value for swipe action">Mover cursor para o início da linha</string>
+    <string name="pref__gestures__swipe_action__move_cursor_end_of_line" comment="Preference value for swipe action">Mover cursor para o fim da linha</string>
     <string name="pref__gestures__swipe_action__shift" comment="Preference value for swipe action">Shift</string>
+    <string name="pref__gestures__swipe_action__show_input_method_picker" comment="Preference value for swipe action">Mostrar alternador de teclado</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_keyboard" comment="Preference value for swipe action">Mudar para teclado anterior</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_subtype" comment="Preference value for swipe action">Mudar para formato de digitação anterior</string>
     <string name="pref__gestures__swipe_action__switch_to_next_subtype" comment="Preference value for swipe action">Mudar para próximo formato de digitação</string>
@@ -175,6 +223,7 @@
     <string name="pref__gestures__space_bar_swipe_up__label" comment="Preference title">Deslizar barra de espaço para cima</string>
     <string name="pref__gestures__space_bar_swipe_left__label" comment="Preference title">Deslizar barra de espaço para esquerda</string>
     <string name="pref__gestures__space_bar_swipe_right__label" comment="Preference title">Deslizar barra de espaço para direita</string>
+    <string name="pref__gestures__space_bar_long_press__label" comment="Preference title">Pressionar e segurar barra de espaço</string>
     <string name="pref__gestures__delete_key_swipe_left__label" comment="Preference title">Deslizar tecla excluir para esquerda</string>
     <string name="pref__gestures__swipe_velocity_threshold__label" comment="Preference title">Limite de velocidade do deslizamento</string>
     <string name="pref__gestures__swipe_velocity_threshold__very_slow" comment="Preference value for swipe velocity threshold">Muito lento</string>
@@ -194,7 +243,7 @@
     <string name="pref__advanced__settings_theme__dark" comment="Possible value of Settings theme preference in Advanced">Escuro</string>
     <string name="pref__advanced__show_app_icon__label" comment="Label of Show app icon preference in Advanced">Mostrar ícone do aplicativo no launcher</string>
     <string name="pref__advanced__force_private_mode__label" comment="Label of Force private mode preference in Advanced">Forçar o modo privado</string>
-    <string name="pref__advanced__force_private_mode__summary" comment="Summary of Force private mode preference in Advanced">Desativará quaisquer recursos que tenham que trabalhar temporariamente com seus dados de entrada</string>
+    <string name="pref__advanced__force_private_mode__summary" comment="Summary of Force private mode preference in Advanced">Isso desativará quaisquer recursos que tenham que trabalhar temporariamente com seus dados de digitação</string>
     <!-- About UI strings -->
     <string name="about__title" comment="Title of About activity">Sobre</string>
     <string name="about__app_icon_content_description" comment="Content description of app icon in About">Ícone do aplicativo FlorisBoard</string>
@@ -203,6 +252,26 @@
     <string name="about__view_source_code" comment="Label of View source code button in About">Código-fonte</string>
     <string name="about__license__title" comment="Title of Open-source licenses dialog">Licenças de código aberto</string>
     <!-- Assets strings -->
+    <plurals name="assets__file__authors">
+        <item quantity="one">Autor</item>
+        <item quantity="other">Autores</item>
+    </plurals>
+    <string name="assets__file__name">Nome</string>
+    <string name="assets__file__source">Fonte</string>
+    <string name="assets__action__add">Adicionar</string>
+    <string name="assets__action__cancel">Cancelar</string>
+    <string name="assets__action__cancel_confirm_title">Confirmar cancelamento</string>
+    <string name="assets__action__cancel_confirm_message">Tem certeza que quer descartar alguma mudança não salva? Esta ação não pode ser desfeita uma vez executada.</string>
+    <string name="assets__action__delete">Excluir</string>
+    <string name="assets__action__delete_confirm_title">Confirmar exclusão</string>
+    <string name="assets__action__delete_confirm_message">Você tem certeza que deseja excluir \"%s\"? Esta ação não pode ser desfeita uma vez executada.</string>
+    <string name="assets__action__edit">Editar</string>
+    <string name="assets__action__export">Exportar</string>
+    <string name="assets__action__import">Importar</string>
+    <string name="assets__action__no">Não</string>
+    <string name="assets__action__save">Salvar</string>
+    <string name="assets__action__yes">Sim</string>
+    <string name="assets__error__invalid">Inválido</string>
     <!-- Setup UI strings -->
     <string name="setup__title" comment="Title of Setup">Configurar</string>
     <string name="setup__prev_button" comment="Label of Previous button in Setup (try to find a short translation due to limited space in UI)">Anterior</string>

app/src/main/res/values-pt/strings.xml

@@ -40,6 +40,7 @@
     <string name="settings__title" comment="Title of Settings">Definições</string>
     <string name="settings__menu" comment="Hint of top-right three-dot icon in Settings">Mais opções</string>
     <string name="settings__menu_help" comment="Three-dot menu entry for Help and Feedback web link">Ajuda e comentários</string>
+    <string name="settings__help" comment="General label for help buttons in Settings">Ajuda</string>
     <string name="settings__navigation__home" comment="Long-press hint of bottom nav item Home in Settings">Início</string>
     <string name="settings__navigation__keyboard" comment="Long-press hint of bottom nav item Keyboard in Settings">Teclado</string>
     <string name="settings__navigation__typing" comment="Long-press hint of bottom nav item Typing in Settings">Digitação</string>
@@ -64,37 +65,55 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Este subtipo já existe!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Tema do teclado</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Indefinido</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Cor de fundo</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Cor de fundo quando ativo</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Cor de fundo quando premida</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Cor principal</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Cor principal (alternativa)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Cor principal (CapsLock)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Selecione uma cor</string>
+    <string name="pref__theme__mode__label" comment="Label of the theme mode preference">Modo do tema</string>
+    <string name="pref__theme__mode__always_day" comment="Preference value for theme mode">Sempre de dia</string>
+    <string name="pref__theme__mode__always_night" comment="Preference value for theme mode">Sempre noite</string>
+    <string name="pref__theme__mode__follow_system" comment="Preference value for theme mode">Acompanhar sistema</string>
+    <string name="pref__theme__mode__follow_time" comment="Preference value for theme mode">Acompanhar hora</string>
+    <string name="pref__theme__sunrise_time__label" comment="Label of the sunrise time preference">Hora do nascer do sol</string>
+    <string name="pref__theme__sunset_time__label" comment="Label of the sunset time preference">Hora do pôr do sol</string>
+    <string name="pref__theme__day" comment="Label of the day group (day means light theme)">Tema diurno</string>
+    <string name="pref__theme__night" comment="Label of the night group (night means dark theme)">Tema noturno</string>
+    <string name="pref__theme__any_theme__label" comment="Label of the theme selector preference">Tema selecionado</string>
+    <string name="pref__theme__any_theme_adapt_to_app__label" comment="Label of the theme adapt to app preference">Ajustar cores às aplicações</string>
+    <string name="pref__theme__any_theme_adapt_to_app__summary" comment="Summary of the theme adapt to app preference">As cores do tema ajustam-se às da aplicação, se a aplicação de destino assim o permitir.</string>
+    <string name="pref__theme__source_assets" comment="Label for the theme source field">Dados da aplicação FlorisBoard</string>
+    <string name="pref__theme__source_internal" comment="Label for the theme source field">Armazenamento interno</string>
+    <string name="pref__theme__source_external" comment="Label for the theme source field">Fornecedor externo</string>
+    <string name="settings__theme_manager__title_day" comment="Title of the theme manager activity for day theme">Gestor de temas (dia)</string>
+    <string name="settings__theme_manager__title_night" comment="Title of the theme manager activity for night theme">Gestor de temas (noite)</string>
+    <string name="settings__theme_manager__create_empty" comment="Label of the Create empty FAB action">Criar tema vazio</string>
+    <string name="settings__theme_manager__create_from_selected" comment="Label of the Create from selected FAB action">Criar tendo por base o tema atual</string>
+    <string name="settings__theme_manager__theme_custom_title" comment="Title template for a custom theme">Personalizado (baseado em %s)</string>
+    <string name="settings__theme_manager__theme_new_title" comment="Title template for a new theme">Novo tema</string>
+    <string name="settings__theme_editor__title" comment="Title of the edit theme activity">Editar tema</string>
+    <string name="settings__theme_editor__name_label" comment="Label of name input">Nome</string>
+    <string name="settings__theme_editor__type_label" comment="Label of type input">Tipo</string>
+    <string name="settings__theme_editor__add_group_dialog_title" comment="Title of the add group dialog in the theme editor">Adicionar grupo</string>
+    <string name="settings__theme_editor__edit_group_dialog_title" comment="Title of the edit group dialog in the theme editor">Editar grupo</string>
+    <string name="settings__theme_editor__add_attr_dialog_title" comment="Title of the add attribute dialog in the theme editor">Adicionar atributo</string>
+    <string name="settings__theme_editor__edit_attr_dialog_title" comment="Title of the edit attribute dialog in the theme editor">Editar atributo</string>
+    <string name="settings__theme_editor__value_type_reference" comment="Theme value type">Referência</string>
+    <string name="settings__theme_editor__value_type_reference_group" comment="Theme value type sub-field">Grupo</string>
+    <string name="settings__theme_editor__value_type_reference_attr" comment="Theme value type sub-field">Atributo</string>
+    <string name="settings__theme_editor__value_type_solid_color" comment="Theme value type">Cor sólida</string>
+    <string name="settings__theme_editor__value_type_lin_grad" comment="Theme value type">Gradiente linear</string>
+    <string name="settings__theme_editor__value_type_rad_grad" comment="Theme value type">Gradiente radial</string>
+    <string name="settings__theme_editor__value_type_on_off" comment="Theme value type">Comutador</string>
+    <string name="settings__theme_editor__value_type_on_off_state" comment="Theme value type sub-field">Estado</string>
+    <string name="settings__theme_editor__value_type_other" comment="Theme value type">Outro</string>
+    <string name="settings__theme_editor__value_type_other_text" comment="Theme value type sub-field">Texto</string>
+    <string name="settings__theme_editor__value_preview_content_description" comment="Theme value preview content description">Antevisão do tema</string>
+    <string name="settings__theme_editor__error_theme_label_empty" comment="Error text for an empty theme label">Introduza o nome para o tema.</string>
+    <string name="settings__theme_editor__error_group_name" comment="Error text for an invalid group name">O nome do grupo apenas pode conter letras (a–z e/ou A–Z), dois pontos(:) para subgrupos e, adicionalmente, números (0–9), til (~) e sublinhado (_) para etiquetas de teclas.</string>
+    <string name="settings__theme_editor__error_group_name_empty" comment="Error text for an empty group name">Introduza o nome para o grupo.</string>
+    <string name="settings__theme_editor__error_attr_name" comment="Error text for an invalid attribute name">O nome do atributo apenas pode conter letras (a-z e/ou A-Z).</string>
+    <string name="settings__theme_editor__error_attr_name_empty" comment="Error text for an empty attribute name">Introduza o nome para o atributo.</string>
     <string name="settings__theme__group_window" comment="Theme group label">Janela e sistema</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Teclado</string>
     <string name="settings__theme__group_key" comment="Theme group label">Tecla</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Tecla Enter</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Ampliação de teclas</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Tecla Shift</string>
     <string name="settings__theme__group_media" comment="Theme group label">Contexto multimédia</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">Uma mão</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">Botão do modo uma mão</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">Modo privado</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">Barra inteligente</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Botão da barra inteligente</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Cor primária</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">Aplicada ao separador multimédia e ao destaque de seleção</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Cor primária (escura)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">Opção reservada para implementações futuras</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Cor de destaque</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">Aplicada ao separador de emojis</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Cor da barra de navegação</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">A cor de fundo da barra de navegação</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">Botões da barra de navegação escura</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">Ative para usar a cor escura ou desative para cor clara.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">Contorno de teclas</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">Defina como Ligado para mostrar ou Desligado para ocultar</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Preferências do teclado</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Teclas</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">Linha de números</string>
@@ -154,17 +173,23 @@
     <string name="pref__glide__enabled__summary" comment="Preference summary">Digitar uma palavra deslizando o dedo através das teclas</string>
     <string name="pref__glide__show_trail__label" comment="Preference title">[NYI] Mostrar rasto de escrita</string>
     <string name="pref__glide__show_trail__summary" comment="Preference summary">O rasto desparece no final da palavra</string>
-    <string name="pref__gestures__general_title" comment="Preference group title">Gestos</string>
+    <string name="pref__gestures__general_title" comment="Preference group title">Gestos genéricos</string>
+    <string name="pref__gestures__space_bar_title" comment="Preference group title">Gestos na barra de espaço</string>
+    <string name="pref__gestures__other_title" comment="Preference group title">Outros gestos/Limitação de gestos</string>
     <string name="pref__gestures__swipe_action__no_action" comment="Preference value for swipe action">Sem ação</string>
     <string name="pref__gestures__swipe_action__delete_characters_precisely" comment="Preference value for swipe action">Remover caracteres com precisão</string>
     <string name="pref__gestures__swipe_action__delete_word" comment="Preference value for swipe action">Remover palavra atual</string>
     <string name="pref__gestures__swipe_action__delete_words_precisely" comment="Preference value for swipe action">Remover palavras com precisão</string>
     <string name="pref__gestures__swipe_action__hide_keyboard" comment="Preference value for swipe action">Ocultar teclado</string>
+    <string name="pref__gestures__swipe_action__insert_space" comment="Preference value for swipe action">Inserir espaço</string>
     <string name="pref__gestures__swipe_action__move_cursor_up" comment="Preference value for swipe action">Mover cursor para cima</string>
     <string name="pref__gestures__swipe_action__move_cursor_down" comment="Preference value for swipe action">Mover cursor para baixo</string>
     <string name="pref__gestures__swipe_action__move_cursor_left" comment="Preference value for swipe action">Mover cursor para a esquerda</string>
     <string name="pref__gestures__swipe_action__move_cursor_right" comment="Preference value for swipe action">Mover cursor para a direita</string>
+    <string name="pref__gestures__swipe_action__move_cursor_start_of_line" comment="Preference value for swipe action">Mover cursor para o início da linha</string>
+    <string name="pref__gestures__swipe_action__move_cursor_end_of_line" comment="Preference value for swipe action">Mover cursor para o fim da linha</string>
     <string name="pref__gestures__swipe_action__shift" comment="Preference value for swipe action">Tecla Shift</string>
+    <string name="pref__gestures__swipe_action__show_input_method_picker" comment="Preference value for swipe action">Mostrar seletor do método de introdução</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_keyboard" comment="Preference value for swipe action">Trocar para o teclado anterior</string>
     <string name="pref__gestures__swipe_action__switch_to_prev_subtype" comment="Preference value for swipe action">Trocar para o subtipo anterior</string>
     <string name="pref__gestures__swipe_action__switch_to_next_subtype" comment="Preference value for swipe action">Trocar para o subtipo seguinte</string>
@@ -175,6 +200,7 @@
     <string name="pref__gestures__space_bar_swipe_up__label" comment="Preference title">Deslize acima na barra de espaços</string>
     <string name="pref__gestures__space_bar_swipe_left__label" comment="Preference title">Deslizar à esquerda na barra de espaços</string>
     <string name="pref__gestures__space_bar_swipe_right__label" comment="Preference title">Deslizar à direita na barra de espaços</string>
+    <string name="pref__gestures__space_bar_long_press__label" comment="Preference title">Toque longo na barra de espaço</string>
     <string name="pref__gestures__delete_key_swipe_left__label" comment="Preference title">Deslizar à esquerda na tecla Delete</string>
     <string name="pref__gestures__swipe_velocity_threshold__label" comment="Preference title">Velocidade de deslize</string>
     <string name="pref__gestures__swipe_velocity_threshold__very_slow" comment="Preference value for swipe velocity threshold">Muito lenta</string>
@@ -203,6 +229,26 @@
     <string name="about__view_source_code" comment="Label of View source code button in About">Código-fonte</string>
     <string name="about__license__title" comment="Title of Open-source licenses dialog">Licenças Open Source</string>
     <!-- Assets strings -->
+    <plurals name="assets__file__authors">
+        <item quantity="one">Autor</item>
+        <item quantity="other">Autores</item>
+    </plurals>
+    <string name="assets__file__name">Nome</string>
+    <string name="assets__file__source">Fonte</string>
+    <string name="assets__action__add">Adicionar</string>
+    <string name="assets__action__cancel">Cancelar</string>
+    <string name="assets__action__cancel_confirm_title">Confirmação</string>
+    <string name="assets__action__cancel_confirm_message">Tem a certeza de que deseja descartar as alterações? Esta ação não pode ser revertida.</string>
+    <string name="assets__action__delete">Apagar</string>
+    <string name="assets__action__delete_confirm_title">Confirmar eliminação</string>
+    <string name="assets__action__delete_confirm_message">Tem a certeza de que deseja apagar \"%s\"? Esta ação não pode ser revertida.</string>
+    <string name="assets__action__edit">Editar</string>
+    <string name="assets__action__export">Exportar</string>
+    <string name="assets__action__import">Importar</string>
+    <string name="assets__action__no">Não</string>
+    <string name="assets__action__save">Guardar</string>
+    <string name="assets__action__yes">Sim</string>
+    <string name="assets__error__invalid">Inválido</string>
     <!-- Setup UI strings -->
     <string name="setup__title" comment="Title of Setup">Configuração</string>
     <string name="setup__prev_button" comment="Label of Previous button in Setup (try to find a short translation due to limited space in UI)">Recuar</string>

app/src/main/res/values-ru/strings.xml

@@ -64,34 +64,11 @@
     <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Этот подтип уже существует!</string>
     <string name="settings__theme__title" comment="Title of the Theme fragment">Тема клавиатуры</string>
     <string name="settings__theme__undefined" comment="General string for an undefined preference value">Не определено</string>
-    <string name="settings__theme__background" comment="General label for a background preference">Цвет фона</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Цвет фона когда активно</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Фоновой цвет при нажатии</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Цвет переднего плана</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Цвет переднего плана (другое)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Цвет переднего плана (caps lock)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Выберите цвет</string>
     <string name="settings__theme__group_window" comment="Theme group label">Окно &amp; Система</string>
     <string name="settings__theme__group_keyboard" comment="Theme group label">Клавиатура</string>
     <string name="settings__theme__group_key" comment="Theme group label">Кнопки</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Введите текст сюда</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Открыть поп-ап</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Клавиша регистра</string>
     <string name="settings__theme__group_media" comment="Theme group label">Медиа контекст</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">Одноручный ввод</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">Кнопка одноручного ввода</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">Приватный режим</string>
     <string name="settings__theme__group_smartbar" comment="Theme group label">Умная панель</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Настройки Умной панели</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Основной цвет</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Основной цвет (темный)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">В настоящее время не используется, зарезервировано для будущей реализации</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Цветовой акцент</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Цвет панели навигации</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">Фон панели навигации.</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">Установите ON для темного или OFF для светлого режима.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">Граница клавиш</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">Чтобы показать границы установите ON или OFF чтобы скрыть их</string>
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Настройки клавиатуры</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Клавиши</string>
     <string name="pref__keyboard__number_row__label" comment="Preference title">Строка цифр</string>

app/src/main/res/values-sv/strings.xml

@@ -1,16 +1,188 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="key__phone_pause" comment="Label for the Pause key in the telephone keyboard layout">Pausa</string>
+    <string name="key__phone_wait" comment="Label for the Wait key in the telephone keyboard layout">Vänta</string>
     <!-- One-handed strings -->
+    <string name="one_handed__close_btn_content_description" comment="Content description for the one-handed close button">Stäng enhandsläge.</string>
+    <string name="one_handed__move_start_btn_content_description" comment="Content description for the one-handed move to left button">Flytta tangentbord till vänster.</string>
+    <string name="one_handed__move_end_btn_content_description" comment="Content description for the one-handed move to right button">Flytta tangentbord till höger.</string>
     <!-- Private mode info dialog strings -->
+    <string name="private_mode_dialog__title" comment="Title of the private mode dialog">Privatläge</string>
     <!--
     <string name="private_mode_dialog__text" comment="Text of the private mode dialog">The icon you just clicked at indicates that FlorisBoard works in the private mode. This means that all features which require to process and temporarily save your input stop working. This applies at minimum to the following features (if they\'ve been turned on previously):\n\n - Next word algorithm adjustments\n\n - Clipboard paste suggestions\n\n - Clipboard history\n\nFlorisBoard enters this mode either if an app requests it or if it was specifically enabled in the advanced settings.</string>
 -->
     <!-- Media strings -->
+    <string name="media__tab__emojis" comment="Tab description for emojis in the media UI">Emojis</string>
+    <string name="media__tab__emoticons" comment="Tab description for emoticons in the media UI">Emotikoner</string>
+    <string name="media__tab__kaomoji" comment="Tab description for kaomoji in the media UI">Kaomoji</string>
     <!-- Emoji strings -->
+    <string name="emoji__category__smileys_emotion" comment="Emoji category name">Smileys &amp; Emotikoner</string>
+    <string name="emoji__category__people_body" comment="Emoji category name">Personer &amp; Kroppar</string>
+    <string name="emoji__category__animals_nature" comment="Emoji category name">Djur &amp; Natur</string>
+    <string name="emoji__category__food_drink" comment="Emoji category name">Mat &amp; Dryck</string>
+    <string name="emoji__category__travel_places" comment="Emoji category name">Resor &amp; Platser</string>
+    <string name="emoji__category__activities" comment="Emoji category name">Aktiviteter</string>
+    <string name="emoji__category__objects" comment="Emoji category name">Föremål</string>
+    <string name="emoji__category__symbols" comment="Emoji category name">Symboler</string>
+    <string name="emoji__category__flags" comment="Emoji category name">Flaggor</string>
     <!-- Smartbar strings -->
+    <string name="smartbar__quick_action__open_settings" comment="Content-description for the settings quick action in Smartbar">Öppna inställningar.</string>
+    <string name="smartbar__quick_action__private_mode" comment="Content-description for the private mode button in Smartbar">Om synlig, indikerar att privatläge är aktivt. När du klickar på, visas information om privatläget.</string>
     <!-- Settings UI strings -->
+    <string name="settings__title" comment="Title of Settings">Inställningar</string>
+    <string name="settings__menu" comment="Hint of top-right three-dot icon in Settings">Fler alternativ</string>
+    <string name="settings__menu_help" comment="Three-dot menu entry for Help and Feedback web link">Hjälp &amp; återkoppling</string>
+    <string name="settings__navigation__home" comment="Long-press hint of bottom nav item Home in Settings">Hem</string>
+    <string name="settings__navigation__keyboard" comment="Long-press hint of bottom nav item Keyboard in Settings">Tangentbord</string>
+    <string name="settings__navigation__theme" comment="Long-press hint of bottom nav item Theme in Settings">Tema</string>
+    <string name="settings__navigation__gestures" comment="Long-press hint of bottom nav item Gestures in Settings">Gester</string>
+    <string name="settings__default" comment="General string which is used when a preference has the default value set">Standard</string>
+    <string name="settings__system_default" comment="General string which is used when a preference has the system default value set">Systemstandard</string>
+    <string name="settings__home__title" comment="Title of the Home fragment">Välkommen till %s</string>
+    <string name="settings__home__ime_not_enabled" comment="Error message shown in Home fragment when FlorisBoard is not enabled in the system">FlorisBoard är inte aktiverad och kommer därför inte vara tillgänglig som inmatningsmetod i inmatningsväljaren. Tryck här för att lösa problemet.</string>
+    <string name="settings__home__ime_not_selected" comment="Warning message shown in Home fragment when FlorisBoard is not selected as the default keyboard">FlorisBoard är inte vald som standard inmatningsmetod. Tryck här för att lösa problemet.</string>
+    <string name="settings__home__contribute" comment="Contributing message shown in Home fragment">Tack för att du testar FlorisBoard! Detta projekt är fortfarande i alfa och saknar därför vissa funktioner. Om du hittar buggar eller vill lämna några förslag, kolla in arkivet på GitHub och rapportera ett problem. Tack för att du hjälper FlorisBoard bli bättre. Tack!</string>
+    <string name="settings__localization__title" comment="Title of languages and layout box in the Typing fragment">Språk &amp; Tangentbordslayouter</string>
+    <string name="settings__localization__subtype_no_subtypes_configured_warning" comment="Warning message that no subtype has been defined in the Typing fragment">Det verkar som du inte har konfigurerat några undertyper. Undertyp Engelska/QWERTY kommer då användas!</string>
+    <string name="settings__localization__subtype_add" comment="Subtype dialog add button">Lägg till</string>
+    <string name="settings__localization__subtype_add_title" comment="Title of subtype dialog when adding a new subtype">Lägg till undertyp</string>
+    <string name="settings__localization__subtype_apply" comment="Subtype dialog apply button">Tillämpa</string>
+    <string name="settings__localization__subtype_cancel" comment="Subtype dialog cancel button">Avbryt</string>
+    <string name="settings__localization__subtype_delete" comment="Subtype dialog delete button">Radera</string>
+    <string name="settings__localization__subtype_edit_title" comment="Title of subtype dialog when editing an existing subtype">Redigera undertyp</string>
+    <string name="settings__localization__subtype_locale" comment="Label for locale dropdown in subtype dialog">Språk</string>
+    <string name="settings__localization__subtype_layout" comment="Label for keyboard layout dropdown in subtype dialog">Tangentbordslayout</string>
+    <string name="settings__localization__subtype_error_already_exists" comment="Error message shown in subtype dialog when a subtype to add already exists">Denna undertyp finns redan!</string>
+    <string name="settings__theme__title" comment="Title of the Theme fragment">Tangentbordstema</string>
+    <string name="settings__theme__undefined" comment="General string for an undefined preference value">Odefinierad</string>
+    <string name="pref__theme__mode__label" comment="Label of the theme mode preference">Temaläge</string>
+    <string name="pref__theme__mode__always_day" comment="Preference value for theme mode">Alltid dag</string>
+    <string name="pref__theme__mode__always_night" comment="Preference value for theme mode">Alltid natt</string>
+    <string name="pref__theme__mode__follow_system" comment="Preference value for theme mode">Följ systemet</string>
+    <string name="pref__theme__mode__follow_time" comment="Preference value for theme mode">Följ tid</string>
+    <string name="pref__theme__sunrise_time__label" comment="Label of the sunrise time preference">Soluppgångstid</string>
+    <string name="pref__theme__sunset_time__label" comment="Label of the sunset time preference">Solnedgångstid</string>
+    <string name="pref__theme__day" comment="Label of the day group (day means light theme)">Dag tema</string>
+    <string name="pref__theme__night" comment="Label of the night group (night means dark theme)">Natt tema</string>
+    <string name="pref__theme__any_theme__label" comment="Label of the theme selector preference">Valt tema</string>
+    <string name="pref__theme__any_theme_adapt_to_app__label" comment="Label of the theme adapt to app preference">Anpassa färger till appen</string>
+    <string name="pref__theme__any_theme_adapt_to_app__summary" comment="Summary of the theme adapt to app preference">Temafärger anpassas till de i den aktuella appen, om denna stödjer detta.</string>
+    <string name="pref__theme__source_assets" comment="Label for the theme source field">FlorisBoard app-tillgångar</string>
+    <string name="pref__theme__source_internal" comment="Label for the theme source field">Intern lagring</string>
+    <string name="pref__theme__source_external" comment="Label for the theme source field">Extern leverantör</string>
+    <string name="settings__theme_manager__title_day" comment="Title of the theme manager activity for day theme">Temahanterare (Dag)</string>
+    <string name="settings__theme_manager__title_night" comment="Title of the theme manager activity for night theme">Temahanterare (Natt)</string>
+    <string name="settings__theme_manager__create_empty" comment="Label of the Create empty FAB action">Skapa tomt tema</string>
+    <string name="settings__theme_manager__create_from_selected" comment="Label of the Create from selected FAB action">Skapa från valt tema</string>
+    <string name="settings__theme_manager__theme_custom_title" comment="Title template for a custom theme">Anpassat (baserad på %s)</string>
+    <string name="settings__theme_manager__theme_new_title" comment="Title template for a new theme">Nytt tema</string>
+    <string name="settings__theme_editor__title" comment="Title of the edit theme activity">Redigera tema</string>
+    <string name="settings__theme_editor__name_label" comment="Label of name input">Namn</string>
+    <string name="settings__theme_editor__type_label" comment="Label of type input">Typ</string>
+    <string name="settings__theme_editor__add_group_dialog_title" comment="Title of the add group dialog in the theme editor">Lägg till grupp</string>
+    <string name="settings__theme_editor__edit_group_dialog_title" comment="Title of the edit group dialog in the theme editor">Redigera grupp</string>
+    <string name="settings__theme_editor__add_attr_dialog_title" comment="Title of the add attribute dialog in the theme editor">Lägg till egenskap</string>
+    <string name="settings__theme_editor__edit_attr_dialog_title" comment="Title of the edit attribute dialog in the theme editor">Redigera egenskap</string>
+    <string name="settings__theme_editor__value_type_reference" comment="Theme value type">Referens</string>
+    <string name="settings__theme_editor__value_type_reference_group" comment="Theme value type sub-field">Grupp</string>
+    <string name="settings__theme_editor__value_type_reference_attr" comment="Theme value type sub-field">Egenskap</string>
+    <string name="settings__theme_editor__value_type_solid_color" comment="Theme value type">Enfärgad</string>
+    <string name="settings__theme_editor__value_type_lin_grad" comment="Theme value type">Linjär gradient</string>
+    <string name="settings__theme_editor__value_type_rad_grad" comment="Theme value type">Radiell gradient</string>
+    <string name="settings__theme_editor__value_type_on_off" comment="Theme value type">Byt</string>
+    <string name="settings__theme_editor__value_type_on_off_state" comment="Theme value type sub-field">Tillstånd</string>
+    <string name="settings__theme_editor__value_type_other" comment="Theme value type">Annat</string>
+    <string name="settings__theme_editor__value_type_other_text" comment="Theme value type sub-field">Text</string>
+    <string name="settings__theme_editor__value_preview_content_description" comment="Theme value preview content description">Förhandsvisning av temavärde</string>
+    <string name="settings__theme_editor__error_theme_label_empty" comment="Error text for an empty theme label">Vänligen ange ett tema namn.</string>
+    <string name="settings__theme_editor__error_group_name_empty" comment="Error text for an empty group name">Vänligen ange ett grupp namn.</string>
+    <string name="settings__theme_editor__error_attr_name" comment="Error text for an invalid attribute name">Vänligen ange ett egenskapsnamn som bara innehåller följande bokstäver a-z och/eller A-Z.</string>
+    <string name="settings__theme_editor__error_attr_name_empty" comment="Error text for an empty attribute name">Vänligen ange ett egenskapsnamn.</string>
+    <string name="settings__theme__group_keyboard" comment="Theme group label">Tangentbord</string>
+    <string name="settings__theme__group_key" comment="Theme group label">Tangent</string>
+    <string name="settings__theme__group_smartbar" comment="Theme group label">Smartremsa</string>
+    <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Tangentbordsinställningar</string>
+    <string name="pref__keyboard__group_keys__label" comment="Preference group title">Tangenter</string>
+    <string name="pref__keyboard__number_row__label" comment="Preference title">Sifferrad</string>
+    <string name="pref__keyboard__number_row__summary" comment="Preference summary">Visa sifferraden ovanför tecken layouten</string>
+    <string name="pref__keyboard__group_layout__label" comment="Preference group title">Layout</string>
+    <string name="pref__keyboard__one_handed_mode__label" comment="Preference value">Enhandsläge</string>
+    <string name="pref__keyboard__one_handed_mode__off" comment="Preference value">Av</string>
+    <string name="pref__keyboard__one_handed_mode__right" comment="Preference value">Högerhandsläge</string>
+    <string name="pref__keyboard__one_handed_mode__left" comment="Preference value">Vänsterhandsläge</string>
+    <string name="pref__keyboard__height_factor__label" comment="Preference title">Tangentbordshöjd</string>
+    <string name="pref__keyboard__height_factor__extra_short" comment="Preference value">Extra lågt</string>
+    <string name="pref__keyboard__height_factor__short" comment="Preference value">Låg</string>
+    <string name="pref__keyboard__height_factor__mid_short" comment="Preference value">Ganska låg</string>
+    <string name="pref__keyboard__height_factor__normal" comment="Preference value">Normal</string>
+    <string name="pref__keyboard__height_factor__mid_tall" comment="Preference value">Ganska hög</string>
+    <string name="pref__keyboard__height_factor__tall" comment="Preference value">Hög</string>
+    <string name="pref__keyboard__height_factor__extra_tall" comment="Preference value">Extra hög</string>
+    <string name="pref__keyboard__height_factor__custom" comment="Preference value">Anpassat</string>
+    <string name="pref__keyboard__height_factor_custom__label" comment="Preference title">Anpassad tangentbordshöjd värde</string>
+    <string name="pref__keyboard__group_keypress__label" comment="Preference group title">Tangenttryck</string>
+    <string name="pref__keyboard__sound_enabled__label" comment="Preference title">Ljud vis tangenttryck</string>
+    <string name="pref__keyboard__sound_volume__label" comment="Preference title">Volym vid tangenttryck</string>
+    <string name="pref__keyboard__vibration_enabled__label" comment="Preference title">Vibrera vid tangenttryck</string>
+    <string name="pref__keyboard__vibration_strength__label" comment="Preference title">Vibrationsstyrka vid tangentryck</string>
+    <string name="pref__keyboard__popup_visible__summary" comment="Preference summary">Visa popup vid tangenttryck</string>
+    <string name="pref__gestures__swipe_action__shift" comment="Preference value for swipe action">Skift</string>
+    <string name="pref__gestures__swipe_action__switch_to_prev_keyboard" comment="Preference value for swipe action">Byt till föregående tangentbord</string>
+    <string name="pref__gestures__swipe_action__switch_to_prev_subtype" comment="Preference value for swipe action">Byt till föregående undertyp</string>
+    <string name="pref__gestures__swipe_action__switch_to_next_subtype" comment="Preference value for swipe action">Byt till nästa undertyp</string>
+    <string name="pref__gestures__swipe_up__label" comment="Preference title">Svep uppåt</string>
+    <string name="pref__gestures__swipe_down__label" comment="Preference title">Svep nedåt</string>
+    <string name="pref__gestures__swipe_left__label" comment="Preference title">Svep vänster</string>
+    <string name="pref__gestures__swipe_right__label" comment="Preference title">Svep höger</string>
+    <string name="pref__gestures__space_bar_swipe_up__label" comment="Preference title">Blanksteg svep uppåt</string>
+    <string name="pref__gestures__space_bar_swipe_left__label" comment="Preference title">Blanksteg svep vänster</string>
+    <string name="pref__gestures__space_bar_swipe_right__label" comment="Preference title">Blanksteg svep höger</string>
+    <string name="pref__gestures__space_bar_long_press__label" comment="Preference title">Blanksteg långtryck</string>
+    <string name="settings__advanced__title" comment="Title of Advanced settings activity">Avancerat</string>
+    <string name="pref__advanced__settings_theme__label" comment="Label of Settings theme preference in Advanced">Temainställningar</string>
+    <string name="pref__advanced__settings_theme__light" comment="Possible value of Settings theme preference in Advanced">Ljust</string>
+    <string name="pref__advanced__settings_theme__dark" comment="Possible value of Settings theme preference in Advanced">Mörkt</string>
+    <string name="pref__advanced__show_app_icon__label" comment="Label of Show app icon preference in Advanced">Visa appikonen i startprogrammet</string>
+    <string name="pref__advanced__force_private_mode__label" comment="Label of Force private mode preference in Advanced">Tvinga privatläge</string>
     <!-- About UI strings -->
+    <string name="about__title" comment="Title of About activity">Om</string>
+    <string name="about__app_icon_content_description" comment="Content description of app icon in About">FlorisBoard appikon</string>
+    <string name="about__view_licenses" comment="Label of View licenses button in About">Licenser för öppen källkod</string>
+    <string name="about__view_privacy_policy" comment="Label of View privacy policy button in About">Sekretesspolicy</string>
+    <string name="about__view_source_code" comment="Label of View source code button in About">Källkod</string>
+    <string name="about__license__title" comment="Title of Open-source licenses dialog">Licenser för öppen källkod</string>
     <!-- Assets strings -->
+    <plurals name="assets__file__authors">
+        <item quantity="one">Upphovsman</item>
+        <item quantity="other">Upphovsmän</item>
+    </plurals>
+    <string name="assets__file__name">Namn</string>
+    <string name="assets__file__source">Källa</string>
+    <string name="assets__action__add">Lägg till</string>
+    <string name="assets__action__cancel">Avbryt</string>
+    <string name="assets__action__cancel_confirm_title">Bekräfta avbryt</string>
+    <string name="assets__action__delete">Radera</string>
+    <string name="assets__action__delete_confirm_title">Bekräfta radering</string>
+    <string name="assets__action__delete_confirm_message">Är du säker på att du vill radera \"%s\"? Denna åtgärden kan inte ångras efter den har utförts.</string>
+    <string name="assets__action__edit">Redigera</string>
+    <string name="assets__action__export">Exportera</string>
+    <string name="assets__action__import">Importera</string>
+    <string name="assets__action__no">Nej</string>
+    <string name="assets__action__save">Spara</string>
+    <string name="assets__action__yes">Ja</string>
+    <string name="assets__error__invalid">Ogiltig</string>
     <!-- Setup UI strings -->
+    <string name="setup__title" comment="Title of Setup">Konfiguration</string>
+    <string name="setup__prev_button" comment="Label of Previous button in Setup (try to find a short translation due to limited space in UI)">Föregående</string>
+    <string name="setup__cancel_button" comment="Label of Cancel button in Setup">Avbryt</string>
+    <string name="setup__next_button" comment="Label of Next button in Setup (try to find a short translation due to limited space in UI)">Nästa</string>
+    <string name="setup__finish_button" comment="Label of Finish button in Setup">Slutför</string>
+    <string name="setup__ok_button" comment="Label of OK button in Setup">OK</string>
+    <string name="setup__welcome__title" comment="Title of Welcome fragment in Setup">Välkommen!</string>
+    <string name="setup__enable_ime__title" comment="Title of Enable IME fragment in Setup">Aktivera FlorisBoard</string>
+    <string name="setup__make_default__text_switch_button" comment="Label of switch button in Make IME default fragment">Byt tangentbord</string>
+    <string name="setup__finish__title" comment="Title of Setup finished fragment in Setup">Konfiguration färdig!</string>
     <!-- Crash Dialog strings -->
+    <string name="crash_dialog__copy_to_clipboard" comment="Label of Copy to clipboard button in crash dialog">Kopiera till urklipp</string>
+    <string name="crash_dialog__close" comment="Label of Close button in crash dialog">Stäng</string>
 </resources>

app/src/main/res/values/arrays.xml

@@ -45,6 +45,21 @@
         <item>start</item>
     </string-array>
 
+    <string-array name="pref__keyboard__switch_key_mode__entries">
+        <item>@string/pref__keyboard__switch_key_mode__never_show</item>
+        <item>@string/pref__keyboard__switch_key_mode__always_emoji</item>
+        <item>@string/pref__keyboard__switch_key_mode__always_language_internal</item>
+        <item>@string/pref__keyboard__switch_key_mode__always_language_system</item>
+        <item>@string/pref__keyboard__switch_key_mode__dynamic_language_emoji</item>
+    </string-array>
+    <string-array name="pref__keyboard__switch_key_mode__values">
+        <item>never_show</item>
+        <item>always_emoji</item>
+        <item>always_language_internal</item>
+        <item>always_language_system</item>
+        <item>dynamic_language_emoji</item>
+    </string-array>
+
     <string-array name="pref__advanced__settings_theme__entries">
         <item>@string/settings__system_default</item>
         <item>@string/pref__advanced__settings_theme__light</item>

app/src/main/res/values/attrs.xml

@@ -17,6 +17,7 @@
     <declare-styleable name="KeyboardView">
         <attr name="isPreviewKeyboard" format="boolean"/>
         <attr name="isSmartbarKeyboard" format="boolean"/>
+        <attr name="isLoadingPlaceholderKeyboard" format="boolean"/>
     </declare-styleable>
 
     <declare-styleable name="EditingKeyView">

app/src/main/res/values/strings.xml

@@ -47,6 +47,7 @@
     <string name="settings__menu_about" translatable="false" comment="Three-dot menu entry for About activity">@string/about__title</string>
     <string name="settings__menu_advanced" translatable="false" comment="Three-dot menu entry for Advanced activity">@string/settings__advanced__title</string>
     <string name="settings__menu_help" comment="Three-dot menu entry for Help and Feedback web link">Help &amp; feedback</string>
+    <string name="settings__help" comment="General label for help buttons in Settings">Help</string>
     <string name="settings__navigation__home" comment="Long-press hint of bottom nav item Home in Settings">Home</string>
     <string name="settings__navigation__keyboard" comment="Long-press hint of bottom nav item Keyboard in Settings">Keyboard</string>
     <string name="settings__navigation__typing" comment="Long-press hint of bottom nav item Typing in Settings">Typing</string>
@@ -116,42 +117,40 @@
     <string name="settings__theme_editor__value_type_other_text" comment="Theme value type sub-field">Text</string>
     <string name="settings__theme_editor__value_preview_content_description" comment="Theme value preview content description">Preview of the theme value</string>
     <string name="settings__theme_editor__error_theme_label_empty" comment="Error text for an empty theme label">Please enter a theme name.</string>
-    <string name="settings__theme_editor__error_group_name" comment="Error text for an invalid group name">Please enter a group name which only contain letters (a-z and/or A-Z) or colons (:) for sub-grouping.</string>
+    <string name="settings__theme_editor__error_group_name" comment="Error text for an invalid group name">Please enter a group name which only contain letters (a–z and/or A–Z), colons (:) for sub–grouping or additionally numbers (0–9), tilde (~) and underlines (_) for the key label.</string>
     <string name="settings__theme_editor__error_group_name_empty" comment="Error text for an empty group name">Please enter a group name.</string>
+    <string name="settings__theme_editor__error_group_name_already_exists" comment="Error text for a duplicate group name">This group name already exists within this theme. Please choose another one.</string>
     <string name="settings__theme_editor__error_attr_name" comment="Error text for an invalid attribute name">Please enter an attribute name which only contain the letters a-z and/or A-Z.</string>
     <string name="settings__theme_editor__error_attr_name_empty" comment="Error text for an empty attribute name">Please enter an attribute name.</string>
+    <string name="settings__theme_editor__error_attr_name_already_exists" comment="Error text for a duplicate attribute name">This attribute name already exists within this group. Please specify another one.</string>
 
-    <string name="settings__theme__background" comment="General label for a background preference">Background color</string>
-    <string name="settings__theme__background_active" comment="General label for an active background preference">Background color when active</string>
-    <string name="settings__theme__background_pressed" comment="General label for a pressed background preference">Background color when pressed</string>
-    <string name="settings__theme__foreground" comment="General label for a foreground preference">Foreground color</string>
-    <string name="settings__theme__foreground_alt" comment="General label for an alternate foreground preference">Foreground color (alternative)</string>
-    <string name="settings__theme__foreground_capslock" comment="General label for a capslock foreground preference">Foreground color (caps lock)</string>
-    <string name="settings__theme__dialog_title" comment="Title of the color selection dialog for a single theme preference">Select a color</string>
-    <string name="settings__theme__group_window" comment="Theme group label">Window &amp; System</string>
-    <string name="settings__theme__group_keyboard" comment="Theme group label">Keyboard</string>
-    <string name="settings__theme__group_key" comment="Theme group label">Key</string>
-    <string name="settings__theme__group_key_enter" comment="Theme group label">Enter key</string>
-    <string name="settings__theme__group_key_popup" comment="Theme group label">Key popup</string>
-    <string name="settings__theme__group_key_shift" comment="Theme group label">Shift key</string>
-    <string name="settings__theme__group_media" comment="Theme group label">Media context</string>
-    <string name="settings__theme__group_one_handed" comment="Theme group label">One-handed</string>
-    <string name="settings__theme__group_one_handed_button" comment="Theme group label">One-handed button</string>
-    <string name="settings__theme__group_private_mode" comment="Theme group label">Private mode</string>
-    <string name="settings__theme__group_smartbar" comment="Theme group label">Smartbar</string>
-    <string name="settings__theme__group_smartbar_button" comment="Theme group label">Smartbar button</string>
-    <string name="pref__theme__colorPrimary_title" comment="Title of Color primary theme preference">Primary color</string>
-    <string name="pref__theme__colorPrimary_summary" comment="Summary of Color primary theme preference">Applied to main media tab ripple and selection highlight</string>
-    <string name="pref__theme__colorPrimaryDark_title" comment="Title of Color primary dark theme preference">Primary color (dark)</string>
-    <string name="pref__theme__colorPrimaryDark_summary" comment="Summary of Color primary dark theme preference">Currently not used, reserved for future implementation</string>
-    <string name="pref__theme__colorAccent_title" comment="Title of Color accent theme preference">Accent color</string>
-    <string name="pref__theme__colorAccent_summary" comment="Summary of Color accent theme preference">Applied to emoji tab ripple</string>
-    <string name="pref__theme__navBarColor_title" comment="Title of Nav bar color theme preference">Navigation bar color</string>
-    <string name="pref__theme__navBarColor_summary" comment="Summary of Nav bar color theme preference">The background of the navigation bar.</string>
-    <string name="pref__theme__navBarIsLight_title" comment="Title of Nav bar is light theme preference">Navigation bar dark foreground</string>
-    <string name="pref__theme__navBarIsLight_summary" comment="Summary of Nav bar is light theme preference">Set to ON for dark or to OFF for light foreground.</string>
-    <string name="pref__theme__showKeyBorder_title" comment="Title of Show Key Border preference">Key Border</string>
-    <string name="pref__theme__showKeyBorder_summary" comment="Summary of Show Key Border preference">Set to ON to show border or to OFF to hide it</string>
+    <string name="settings__theme__group_window"                comment="Theme group label">Window &amp; System</string>
+    <string name="settings__theme__group_keyboard"              comment="Theme group label">Keyboard</string>
+    <string name="settings__theme__group_key"                   comment="Theme group label">Key</string>
+    <string name="settings__theme__group_key_specific"          comment="Theme group label (%s is specific modifier)">Key (%s)</string>
+    <string name="settings__theme__group_media"                 comment="Theme group label">Media context</string>
+    <string name="settings__theme__group_oneHanded"             comment="Theme group label">One-handed</string>
+    <string name="settings__theme__group_popup"                 comment="Theme group label">Popup</string>
+    <string name="settings__theme__group_privateMode"           comment="Theme group label">Private mode</string>
+    <string name="settings__theme__group_smartbar"              comment="Theme group label">Smartbar</string>
+    <string name="settings__theme__group_smartbarButton"        comment="Theme group label">Smartbar button</string>
+    <string name="settings__theme__group_custom"                comment="Theme group label (%s is custom group name)">Custom group (%s)</string>
+
+    <string name="settings__theme__attr_background"             comment="Theme attribute label">Background color</string>
+    <string name="settings__theme__attr_backgroundActive"       comment="Theme attribute label">Background color (active)</string>
+    <string name="settings__theme__attr_backgroundPressed"      comment="Theme attribute label">Background color (pressed)</string>
+    <string name="settings__theme__attr_foreground"             comment="Theme attribute label">Foreground color</string>
+    <string name="settings__theme__attr_foregroundAlt"          comment="Theme attribute label">Foreground color (alternative)</string>
+    <string name="settings__theme__attr_foregroundPressed"      comment="Theme attribute label">Foreground color (pressed)</string>
+    <string name="settings__theme__attr_showBorder"             comment="Theme attribute label">Show border</string>
+    <string name="settings__theme__attr_colorPrimary"           comment="Theme attribute label">Primary color</string>
+    <string name="settings__theme__attr_colorPrimaryDark"       comment="Theme attribute label">Primary color (dark)</string>
+    <string name="settings__theme__attr_colorAccent"            comment="Theme attribute label">Accent color</string>
+    <string name="settings__theme__attr_navBarColor"            comment="Theme attribute label">Navigation bar color</string>
+    <string name="settings__theme__attr_navBarLight"            comment="Theme attribute label">Navigation bar dark foreground</string>
+    <string name="settings__theme__attr_semiTransparentColor"   comment="Theme attribute label">Semi transparent color</string>
+    <string name="settings__theme__attr_textColor"              comment="Theme attribute label">Text color</string>
+    <string name="settings__theme__attr_custom"                 comment="Theme attribute label (%s is custom attribute name)">Custom attribute (%s)</string>
 
     <string name="settings__keyboard__title" comment="Title of Keyboard preferences fragment">Keyboard Preferences</string>
     <string name="pref__keyboard__group_keys__label" comment="Preference group title">Keys</string>
@@ -163,6 +162,12 @@
     <string name="pref__keyboard__hint_mode__enabled_hint_priority" comment="Preference value">Enabled (Hint is prioritized)</string>
     <string name="pref__keyboard__hint_mode__enabled_accent_priority" comment="Preference value">Enabled (Accent is prioritized)</string>
     <string name="pref__keyboard__hint_mode__enabled_smart_priority" comment="Preference value">Enabled (Smart prioritization)</string>
+    <string name="pref__keyboard__switch_key_mode__label" comment="Preference title">Switch key mode</string>
+    <string name="pref__keyboard__switch_key_mode__always_emoji" comment="Preference value">Emoji switch</string>
+    <string name="pref__keyboard__switch_key_mode__always_language_internal" comment="Preference value">Language switch (Internal)</string>
+    <string name="pref__keyboard__switch_key_mode__always_language_system" comment="Preference value">Language switch (System)</string>
+    <string name="pref__keyboard__switch_key_mode__dynamic_language_emoji" comment="Preference value">Dynamic emoji / language switch (Internal)</string>
+    <string name="pref__keyboard__switch_key_mode__never_show" comment="Preference value">Never show switch</string>
     <string name="pref__keyboard__font_size_multiplier_portrait__label" comment="Preference title">Font size multiplier (portrait)</string>
     <string name="pref__keyboard__font_size_multiplier_landscape__label" comment="Preference title">Font size multiplier (landscape)</string>
     <string name="pref__keyboard__group_layout__label" comment="Preference group title">Layout</string>

app/src/main/res/values/strings_dont_translate.xml

@@ -3,6 +3,7 @@
     <string name="florisboard__issue_tracker_url" translatable="false">https://github.com/florisboard/florisboard/issues</string>
     <string name="florisboard__issue_tracker_new_issue_url" translatable="false">https://github.com/florisboard/florisboard/issues/new</string>
     <string name="florisboard__privacy_policy_url" translatable="false">https://gist.github.com/patrickgold/a18f1e47468d72f0868afc69d6faaf0b</string>
+    <string name="florisboard__theme_editor_wiki_url" translatable="false">https://github.com/florisboard/florisboard/wiki/Using-the-new-Theme-Editor</string>
 
     <string name="key__view_characters" translatable="false">ABC</string>
     <string name="key__view_numeric" translatable="false">1 2\n3 4</string>

app/src/main/res/xml/prefs_keyboard.xml

@@ -31,6 +31,15 @@
             app:title="@string/pref__keyboard__hinted_symbols_mode__label"
             app:useSimpleSummaryProvider="true"/>
 
+        <ListPreference
+            android:defaultValue="dynamic_language_emoji"
+            app:entries="@array/pref__keyboard__switch_key_mode__entries"
+            app:entryValues="@array/pref__keyboard__switch_key_mode__values"
+            app:key="keyboard__switch_key_mode"
+            app:iconSpaceReserved="false"
+            app:title="@string/pref__keyboard__switch_key_mode__label"
+            app:useSimpleSummaryProvider="true"/>
+
         <dev.patrickgold.florisboard.settings.components.DialogSeekBarPreference
             app:allowDividerAbove="false"
             android:defaultValue="100"

fastlane/metadata/android/en-US/changelogs/24.txt

@@ -0,0 +1,9 @@
+- Add ability to customize switch key (emoji, language) (#79)
+- Add ext popups for less-than and greater-than symbols (#219)
+- Add wiki page reference in Theme Editor
+- Improve adaptive theme coloring (#226)
+- Improve startup loading animation
+- Improve theme editor UI and UX
+- Fix color dialog cache problem in theme editor (#237)
+- Fix space bar long press
+- Fix theme group name input validation (again)