148 files changed, 2519 insertions, 1216 deletions

diff --git a/.build.yml b/.build.yml
index 3dd505b2..bf96297a 100644
--- a/.build.yml
+++ b/.build.yml
@@ -18,6 +18,7 @@ requires:
     - libxklavier
     - libxkbcommon
     - accountsservice
+    - systemd-libs
 #    - libayatana-common
 
   debian:
@@ -37,6 +38,7 @@ requires:
     - libxkbregistry-dev
     - libaccountsservice-dev
     - systemd
+    - libudev-dev
 #    - libayatana-common-dev
 # For building libayatana-common:
     - liblomiri-url-dispatcher-dev
@@ -54,6 +56,7 @@ requires:
     - libxklavier-dev
     - libaccountsservice-dev
     - systemd
+    - libudev-dev
 #    - libayatana-common-dev
 #    - libxkbcommon-dev
 #    - libxkbregistry-dev
diff --git a/AUTHORS b/AUTHORS
index 880dd4d1..5a45ec77 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,6 +15,7 @@ gallegonovato <fran-carro@hotmail.es>
 Gediminas Murauskas <muziejusinfo@gmail.com>
 Heimen Stoffels <vistausss@fastmail.com>
 Hosted Weblate <hosted@weblate.org>
+hugoalh <hugoalh@users.noreply.hosted.weblate.org>
 Iain Lane <iain@orangesquash.org.uk>
 Ivo Xavier <ivofernandes12@gmail.com>
 Jeannette L <j.lavoie@net-c.ca>
@@ -45,6 +46,7 @@ Pavel Borecki <pavel.borecki@gmail.com>
 phlostically <phlostically@mailinator.com>
 Prachi Joshi <josprachi@yahoo.com>
 Quentin PAGƈS <quentinantonin@free.fr>
+Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>
 Reza Almanda <rezaalmanda27@gmail.com>
 Robert Tari <robert@tari.in>
 Sebastien Bacher <seb128@ubuntu.com>
@@ -70,4 +72,5 @@ xiao0yy <xiao0yy@gmail.com>
 Yaron Shahrabani <sh.yaron@gmail.com>
 Yota321 <golamsayan@gmail.com>
 ŠœŠøрŠ° Š”трŠ°Š½Š½Š°Ń <miraityan2004@gmail.com>
+ą®¤ą®®ą®æą®“ąÆą®ØąÆ‡ą®°ą®®ąÆ <anishprabu.t@gmail.com>
 复äŗˆ <clonewith@qq.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a78e7e1f..30fed304 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 3.13)
-project (ayatana-indicator-keyboard VERSION "24.5.0" LANGUAGES C CXX)
+project (ayatana-indicator-keyboard VERSION "24.7.2" LANGUAGES C CXX)
 
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE)
@@ -38,7 +38,8 @@ add_definitions (-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}" -DLOCALEDIR="${CMAKE_INS
 find_package (PkgConfig REQUIRED)
 include (CheckIncludeFile)
 include (FindPkgConfig)
-pkg_check_modules(SERVICE_DEPS REQUIRED glib-2.0>=2.36 gio-2.0>=2.36 libayatana-common>=0.9.9 accountsservice xkbcommon>=1.0.3 xkbregistry>=1.0.3)
+
+pkg_check_modules(SERVICE_DEPS REQUIRED glib-2.0>=2.36 gio-2.0>=2.36 libayatana-common>=0.9.11 accountsservice xkbcommon>=1.0.3 xkbregistry>=1.0.3 libudev)
 pkg_check_modules(X11_DEPS REQUIRED x11>=1.6.5 libxklavier>=5.3)
 include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS})
 
diff --git a/ChangeLog b/ChangeLog
index 56ca9300..c5e1e93a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,115 @@
+2025-03-02 Mike Gabriel
+
+        * release 24.7.2 (HEAD -> main, tag: 24.7.2)
+        * debian/control: Bump versioned B-D: on libayatana-common to (>=
+          0.9.11). (371fbc2b)
+
+2025-02-28 Robert Tari
+
+        * Merge branch 'sunweaver-pr/hide-osk-toggle-on-ubuntutouch'
+          (2870762e)
+
+2025-02-28 Mike Gabriel
+
+        * src/service.c: Don't show 'always-show-osk' toggle switch when on
+          Ubuntu Touch. (cfa3db55)
+        * CMakeLists.txt: Require libayatana-common (>= 0.9.11). (c2bc6d02)
+        * Translated using Weblate (German) (fc481b15)
+
+2025-02-24 Heimen Stoffels
+
+        * Translated using Weblate (Dutch) (892166cf)
+
+2025-02-23 Remus-Gabriel Chelu
+
+        * Translated using Weblate (Romanian) (7a0303ee)
+
+2025-02-24 Wellington Terumi Uemura
+
+        * Translated using Weblate (Portuguese (Brazil)) (6ae6432f)
+
+2025-02-23 Mike Gabriel
+
+        * po/: Update translation files. (2fca7abb)
+        * release 24.7.1 (beb2f01c) (tag: 24.7.1)
+        * Merge branch 'tari01-pr/osk-switch' (df9de377)
+
+2025-02-20 Robert Tari
+
+        * src/service.c: Add Always show OSK switch (35c5c001)
+
+2025-02-23 Mike Gabriel
+
+        * Merge branch 'tari01-pr/drop-pkla' (bbdd2b6d)
+
+2025-01-15 Robert Tari
+
+        * Drop the deprecated PolicyKit *.pkla file (20507c3d)fixes:
+          https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1093061
+
+2025-02-23 Mike Gabriel
+
+        * Merge branch 'tari01-pr/system-layouts' (95e94abd)
+
+2024-07-18 Robert Tari
+
+        * Never crash when getting system layouts (95eb5965)
+
+2024-11-08 ą®¤ą®®ą®æą®“ąÆą®ØąÆ‡ą®°ą®®ąÆ
+
+        * Translated using Weblate (Tamil) (270798fb)
+
+2024-10-30 hugoalh
+
+        * Translated using Weblate (Chinese (Traditional Han script))
+          (4e821b0d)
+
+2024-09-27 Remus-Gabriel Chelu
+
+        * Translated using Weblate (Romanian) (617bde70)
+
+2024-07-15 Mike Gabriel
+
+        * Merge branch 'tari01-pr/multiple-system-layouts' (2da4c6e9)
+
+2024-07-11 Robert Tari
+
+        * Support multiple system layouts (907c32c0)
+
+2024-07-10 Mike Gabriel
+
+        * release 24.7.0 (b5eecfc6) (tag: 24.7.0)
+
+2024-07-08 Mike Gabriel
+
+        * Merge branch 'tari01-pr/lomiri-session' (340ef997)
+
+2024-07-05 Robert Tari
+
+        * debian/rules: Build with ENABLE_UBUNTU_ACCOUNTSSERVICE on Ubuntu
+          and derivatives (6357866d)
+
+2024-06-17 Robert Tari
+
+        * Fix integration with Lomiri session (a7045072)
+
+2024-06-13 Robert Tari
+
+        * Merge branch
+          'sunweaver-pr/support-more-characters-in-Xkb-parameters'
+          (a630e4bb)
+
+2024-05-28 Mike Gabriel
+
+        * src/keyboard-x11.c: Add ',' and '0-9' as allowed characters to
+          regexp for XkbLayout. (b18f267f)
+        * src/keyboard-x11.c: Add ',' and '0-9' as allowed characters to
+          regexp for XkbVariant. (5bb69d76)
+        * src/keyboard-x11.c: Amend file permissions (a-x). (fa22c11a)
+
 2024-05-22 Mike Gabriel
 
-        * release 24.5.0 (HEAD -> main, tag: 24.5.0)
+        * release 24.5.0 (a5c5b784) (tag: 24.5.0)
 
 2024-05-21 Robert Tari
 
diff --git a/NEWS b/NEWS
index 537fa26d..7862d281 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,28 @@
+Overview of changes in ayatana-indicator-keyboard 24.7.2
+
+  - CMakeLists.txt: Require libayatana-common (>= 0.9.11).
+    Ubuntu Touch.
+  - src/service.c: Don't show 'always-show-osk' toggle switch when on
+    0.9.11).
+  - Update translation files.
+
+Overview of changes in ayatana-indicator-keyboard 24.7.1
+
+  - Support multiple system keyboard layouts.
+  - Never crash when getting system layouts.
+  - Drop the deprecated PolicyKit *.pkla file.
+  - src/service.c: Add Always show OSK switch.
+  - Translation updates.
+
+Overview of changes in ayatana-indicator-keyboard 24.7.0
+
+  - src/keyboard-x11.c: Amend file permissions (a-x).
+  - src/keyboard-x11.c: Add ',' and '0-9' as allowed characters to
+    regexp for XkbVariant.
+  - src/keyboard-x11.c: Add ',' and '0-9' as allowed characters to
+    regexp for XkbLayout.
+  - Fix integration with Lomiri session.
+
 Overview of changes in ayatana-indicator-keyboard 24.5.0
 
   - data/ayatana-indicator-keyboard.service.in: Become part of
diff --git a/data/50-org.ayatana.indicator.keyboard.AccountsService.pkla b/data/50-org.ayatana.indicator.keyboard.AccountsService.pkla
deleted file mode 100644
index f562c6fd..00000000
--- a/data/50-org.ayatana.indicator.keyboard.AccountsService.pkla
+++ /dev/null
@@ -1,6 +0,0 @@
-[Allow LightDM to set AccountsService fields]
-Identity=unix-user:lightdm
-Action=org.ayatana.indicator.keyboard.AccountsService.ModifyAnyUser
-ResultActive=yes
-ResultInactive=yes
-ResultAny=yes
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index a3efca54..13fe6c81 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -48,10 +48,6 @@ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ../../d
 
 install(FILES org.ayatana.indicator.keyboard.AccountsService.policy DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/polkit-1/actions")
 
-# 50-org.ayatana.indicator.keyboard.AccountsService.pkla
-
-install(FILES 50-org.ayatana.indicator.keyboard.AccountsService.pkla DESTINATION "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/polkit-1/localauthority/10-vendor.d")
-
 # 50-org.ayatana.indicator.keyboard.AccountsService.rules
 
 install (FILES 50-org.ayatana.indicator.keyboard.AccountsService.rules DESTINATION "${CMAKE_INSTALL_FULL_DATADIR}/polkit-1/rules.d")
diff --git a/debian/changelog b/debian/changelog
index 6d814381..a547acb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+ayatana-indicator-keyboard (24.7.2-0) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-indicator-keyboard.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sun, 02 Mar 2025 17:45:33 +0100
+
+ayatana-indicator-keyboard (24.7.1-0) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-indicator-keyboard.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sun, 23 Feb 2025 18:13:56 +0100
+
+ayatana-indicator-keyboard (24.7.0-0) unstable; urgency=medium
+
+  * Upstream-provided Debian package for ayatana-indicator-keyboard.
+    See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Wed, 10 Jul 2024 13:26:41 +0200
+
 ayatana-indicator-keyboard (24.5.0-0) unstable; urgency=medium
 
   * Upstream-provided Debian package for ayatana-indicator-keyboard.
diff --git a/debian/control b/debian/control
index d7ebffcc..82f08630 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,11 @@ Build-Depends: cmake,
                libglib2.0-dev (>= 2.36),
                libx11-dev (>=1.7.0),
                libxklavier-dev (>=5.4),
-               libayatana-common-dev (>= 0.9.9),
+               libayatana-common-dev (>= 0.9.11),
                libxkbcommon-dev (>=1.0.3),
                libxkbregistry-dev (>=1.0.3),
                libaccountsservice-dev,
+               libudev-dev,
 # for packaging
                debhelper (>= 10),
                dh-systemd | hello,
@@ -28,7 +29,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ayatana-indicator-common,
-         matekbd-keyboard-display | gkbd-capplet,
+         matekbd-keyboard-display | gkbd-capplet | tecla,
 Description: Ayatana Indicator Keyboard Applet
  This package contains the keyboard indicator, which should show as an
  icon in the top panel of indicator aware destkop environments.
diff --git a/po/aa.po b/po/aa.po
index cb27da32..b25659df 100644
--- a/po/aa.po
+++ b/po/aa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/af.po b/po/af.po
index e010a9d2..e7a4d039 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/am.po b/po/am.po
index 3a1e2e84..64aed9a9 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/an.po b/po/an.po
index d8b0a730..63e1d7fa 100644
--- a/po/an.po
+++ b/po/an.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 7165273d..7438063a 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2022-03-27 13:12+0000\n"
 "Last-Translator: ButterflyOfFire <ButterflyOfFire@protonmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/ayatana-"
@@ -38,22 +38,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Ł„ŁˆŲ­Ų© Ų§Ł„Ł…ŁŲ§ŲŖŁŠŲ­"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/as.po b/po/as.po
index 3c3dee14..337dc66b 100644
--- a/po/as.po
+++ b/po/as.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ast.po b/po/ast.po
index 5dd4eaf0..e4c9e543 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ayatana-indicator-keyboard.pot b/po/ayatana-indicator-keyboard.pot
index b708fb66..b72a4826 100644
--- a/po/ayatana-indicator-keyboard.pot
+++ b/po/ayatana-indicator-keyboard.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,22 +35,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/az.po b/po/az.po
index ca454c2d..b15c4d03 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/be.po b/po/be.po
index 662483f3..2acce6cb 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -36,22 +36,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/bem.po b/po/bem.po
index 85f0703e..f307c4cf 100644
--- a/po/bem.po
+++ b/po/bem.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index dd8c3ac2..6de9bf8c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,22 +35,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/bn.po b/po/bn.po
index 07d2d7ea..321191fa 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/bo.po b/po/bo.po
index 4fd7ca40..8b21bf02 100644
--- a/po/bo.po
+++ b/po/bo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/br.po b/po/br.po
index b4600c12..d7e7a8b7 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/bs.po b/po/bs.po
index 1b6646b0..073f145e 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index bdb288c0..18f080f1 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2023-06-23 22:51+0000\n"
 "Last-Translator: Joan CiberSheep <cibersheep@gmail.com>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/ayatana-"
@@ -39,23 +39,27 @@ msgstr "Mostra la icona de llengua en mode telĆØfon"
 msgid "Show the language icon in the greeter."
 msgstr "Mostra la icona d'idioma a la pantalla d'inici."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Teclat"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "Intercanviador de la disposiciĆ³ del teclat i configuraciĆ³"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "DisposiciĆ³ del teclat actual"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "ParĆ metres del teclatā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 #, fuzzy
 msgid "Show Current Layout"
 msgstr "DisposiciĆ³ del teclat actual"
diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 5b0caefd..a4ca73e5 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ce.po b/po/ce.po
index 4687bb21..ce41b728 100644
--- a/po/ce.po
+++ b/po/ce.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ckb.po b/po/ckb.po
index 15f57032..c3dd995e 100644
--- a/po/ckb.po
+++ b/po/ckb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/co.po b/po/co.po
index 6a1c1d88..02115085 100644
--- a/po/co.po
+++ b/po/co.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/crh.po b/po/crh.po
index 994b227f..d8ff0dee 100644
--- a/po/crh.po
+++ b/po/crh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index 83a4fc44..ac247fa0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2023-09-21 11:59+0000\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-03-15 10:18+0000\n"
 "Last-Translator: Jozef Mlich <jmlich83@gmail.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/ayatana-indicators/"
 "keyboard-applet/cs/>\n"
@@ -16,8 +16,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 5.1-dev\n"
+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2);\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -39,23 +39,27 @@ msgstr "Zobrazit ikonu jazyka v režimu telefonu."
 msgid "Show the language icon in the greeter."
 msgstr "Zobrazit ikonu jazyka v uvĆ­tacĆ­m pozdravu."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "KlƔvesnice"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "PřepĆ­nač rozloženĆ­ klĆ”vesnice a nastavenĆ­"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "AktuĆ”lnĆ­ rozloženĆ­ klĆ”vesnice"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "Vždy zobrazovat klĆ”vesnici na obrazovce"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "NastavenĆ­ klĆ”vesniceā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "Zobrazit aktuĆ”lnĆ­ rozloženĆ­"
 
diff --git a/po/csb.po b/po/csb.po
index eaef6af7..3c1ab4f1 100644
--- a/po/csb.po
+++ b/po/csb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/cv.po b/po/cv.po
index 520da0a6..169dc11c 100644
--- a/po/cv.po
+++ b/po/cv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/cy.po b/po/cy.po
index 9973eb96..b7510449 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 9de6099f..710299ca 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,22 +35,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 71c4c084..68640eb7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2023-09-15 14:18+0000\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-02-28 21:35+0000\n"
 "Last-Translator: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/ayatana-"
-"indicators/keyboard-applet/de/>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/"
+"ayatana-indicators/keyboard-applet/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.0.1-dev\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -40,23 +40,27 @@ msgstr "Sprachlayoutsymbol im Phone-Modus anzeigen."
 msgid "Show the language icon in the greeter."
 msgstr "Sprachlayoutsymbol im Greeter-Modus anzeigen."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "Tastaturbelegung umschalten und Tastatureinstellungen"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Aktuelle Tastaturbelegung"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "Bildschirmtastatur immer anzeigen"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "Tastatureinstellungenā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "Aktuelle Tastaturbelegung anzeigen"
 
diff --git a/po/dv.po b/po/dv.po
index 5b19c859..28141f15 100644
--- a/po/dv.po
+++ b/po/dv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index a5530740..1224e089 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,22 +35,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/en_AU.po b/po/en_AU.po
index b7cada30..bc960b4b 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,24 +35,28 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Keyboard"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Current keyboard layout"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 #, fuzzy
 msgid "Keyboard Settingsā€¦"
 msgstr "Keyboard Settings..."
 
-#: src/service.c:196
+#: src/service.c:207
 #, fuzzy
 msgid "Show Current Layout"
 msgstr "Current keyboard layout"
diff --git a/po/en_CA.po b/po/en_CA.po
index 2a4874a9..7e2a3280 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,24 +35,28 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Keyboard"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Current keyboard layout"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 #, fuzzy
 msgid "Keyboard Settingsā€¦"
 msgstr "Keyboard Settings..."
 
-#: src/service.c:196
+#: src/service.c:207
 #, fuzzy
 msgid "Show Current Layout"
 msgstr "Current keyboard layout"
diff --git a/po/en_GB.po b/po/en_GB.po
index 71acbaa6..2ff0c5e4 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,24 +35,28 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Keyboard"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Current keyboard layout"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 #, fuzzy
 msgid "Keyboard Settingsā€¦"
 msgstr "Keyboard Settings..."
 
-#: src/service.c:196
+#: src/service.c:207
 #, fuzzy
 msgid "Show Current Layout"
 msgstr "Current keyboard layout"
diff --git a/po/eo.po b/po/eo.po
index d45c1616..96cb2612 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-11-19 02:51+0000\n"
 "Last-Translator: phlostically <phlostically@mailinator.com>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/ayatana-"
@@ -37,23 +37,27 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Klavaro"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Aktuala klavaranĝo"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 #, fuzzy
 msgid "Show Current Layout"
 msgstr "Aktuala klavaranĝo"
diff --git a/po/es.po b/po/es.po
index 1247590d..532b2379 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2023-09-16 20:12+0000\n"
-"Last-Translator: gallegonovato <fran-carro@hotmail.es>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/ayatana-"
-"indicators/keyboard-applet/es/>\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-06-30 03:06+0000\n"
+"Last-Translator: DP <dprietob@users.noreply.hosted.weblate.org>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/"
+"ayatana-indicators/keyboard-applet/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.13-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -39,23 +39,27 @@ msgstr "Mostrar el icono de idioma en el modo telƩfono."
 msgid "Show the language icon in the greeter."
 msgstr "Muestra el Ć­cono de idioma en el saludo."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "Conmutador y configuraciĆ³n de la distribuciĆ³n del teclado"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "DisposiciĆ³n de teclado actual"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "Mostrar siempre OSK"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "Ajustes del tecladoā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "Mostrar el diseƱo actual"
 
diff --git a/po/et.po b/po/et.po
index d2760112..e1a0df8c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2023-04-26 02:47+0000\n"
-"Last-Translator: Kristjan RƤts <kristjanrats@gmail.com>\n"
-"Language-Team: Estonian <https://hosted.weblate.org/projects/ayatana-"
-"indicators/keyboard-applet/et/>\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-05-07 15:05+0000\n"
+"Last-Translator: Priit JƵerĆ¼Ć¼t <hwlate@joeruut.com>\n"
+"Language-Team: Estonian <https://hosted.weblate.org/projects/"
+"ayatana-indicators/keyboard-applet/et/>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.18-dev\n"
+"X-Generator: Weblate 5.12-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -39,23 +39,26 @@ msgstr "Kuva keele ikoon telefonirežiimis."
 msgid "Show the language icon in the greeter."
 msgstr "Kuva keele ikoon tervitajas."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
-msgstr "Klaviatuur"
+msgstr "Klahvistik"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "Klahvipaigutuse seaded ja vahetamine"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Praegune klahvipaigutus"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "NƤita alati ekraaniklahvistikku"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "Klaviatuuri seadedā€¦"
 
-#: src/service.c:196
-#, fuzzy
+#: src/service.c:207
 msgid "Show Current Layout"
-msgstr "Praegune klahvipaigutus"
+msgstr "NƤita praegust klahvipaigutust"
diff --git a/po/eu.po b/po/eu.po
index b63c679b..bb665bc0 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/fa.po b/po/fa.po
index b65684e4..f97f5ed1 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 23336890..68f5081e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,54 +7,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2021-02-20 01:50+0000\n"
-"Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
-"Language-Team: Finnish <https://hosted.weblate.org/projects/ayatana-"
-"indicators/keyboard-applet/fi/>\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-07-18 20:08+0000\n"
+"Last-Translator: Ricky Tigg <ricky.tigg@gmail.com>\n"
+"Language-Team: Finnish <https://hosted.weblate.org/projects/"
+"ayatana-indicators/keyboard-applet/fi/>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.5\n"
+"X-Generator: Weblate 5.13-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
-msgstr ""
+msgstr "NƤytƤ kielikuvake tyƶpƶytƤtilassa."
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:2
 msgid ""
 "If enabled, the indicator shows the current layout icon. Otherwise, it "
 "displays a generic keyboard icon."
 msgstr ""
+"Jos kƤytƶssƤ, ilmaisin nƤyttƤƤ nykyisen asettelun kuvakkeen. Muussa "
+"tapauksessa se nƤyttƤƤ yleisen nƤppƤimistƶkuvakkeen."
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:3
 msgid "Show the language icon in phone mode."
-msgstr ""
+msgstr "NƤytƤ kielikuvake puhelintilassa."
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:4
 msgid "Show the language icon in the greeter."
-msgstr ""
+msgstr "NƤytƤ kielikuvake tervehdysikkunassa."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "NƤppƤimistƶ"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
-msgstr ""
+msgstr "NƤppƤimistƶasettelun vaihtaja ja asetukset"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Nykyinen nƤppƤimistƶasettelu"
 
-#: src/service.c:188
-#, fuzzy
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "NƤytƤ aina OSK"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "NƤppƤimistƶn asetuksetā€¦"
 
-#: src/service.c:196
-#, fuzzy
+#: src/service.c:207
 msgid "Show Current Layout"
-msgstr "Nykyinen nƤppƤimistƶasettelu"
+msgstr "NƤytƤ nykyinen asettelu"
diff --git a/po/fil.po b/po/fil.po
index bc1f91ff..2541de13 100644
--- a/po/fil.po
+++ b/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/fo.po b/po/fo.po
index 76592001..608ef38b 100644
--- a/po/fo.po
+++ b/po/fo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,22 +35,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index ecec63e8..0b805b06 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2024-03-23 23:01+0000\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-03-11 04:59+0000\n"
 "Last-Translator: Steve <steve.kueffer.ch@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/"
 "ayatana-indicators/keyboard-applet/fr/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.5-dev\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -39,22 +39,26 @@ msgstr "Affiche l'icƓne de la langue en mode tƩlƩphone."
 msgid "Show the language icon in the greeter."
 msgstr "Afficher l'icĆ“ne de la langue dans l'Ć©cran dā€™accueil."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Clavier"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "Choix de la disposition du clavier et rƩglages"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Disposition actuelle du clavier"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "Toujours montrer OSK"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "ParamĆØtres du clavierā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "Afficher la prƩsentation actuelle"
diff --git a/po/fr_CA.po b/po/fr_CA.po
index 84376487..b70ad318 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-02-20 01:50+0000\n"
 "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
 "Language-Team: French (Canada) <https://hosted.weblate.org/projects/ayatana-"
@@ -37,24 +37,28 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Clavier"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Disposition actuelle du clavier"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 #, fuzzy
 msgid "Keyboard Settingsā€¦"
 msgstr "ParamĆØtres du clavierā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 #, fuzzy
 msgid "Show Current Layout"
 msgstr "Disposition actuelle du clavier"
diff --git a/po/frp.po b/po/frp.po
index 9a5245e3..9888462e 100644
--- a/po/frp.po
+++ b/po/frp.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/fur.po b/po/fur.po
index a9c4ffd6..d5ec0719 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/fy.po b/po/fy.po
index 751dc621..0c41cebe 100644
--- a/po/fy.po
+++ b/po/fy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ga.po b/po/ga.po
index 3ac686a0..a6c26109 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,22 +35,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/gd.po b/po/gd.po
index a825e208..207abc43 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 9fe19670..abc14eaa 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 8ff30c99..4fc8be43 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/gv.po b/po/gv.po
index 2c64f34a..5926b3bc 100644
--- a/po/gv.po
+++ b/po/gv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index 19530fcf..a9170939 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2023-09-16 20:12+0000\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-05-07 15:05+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
-"Language-Team: Hebrew <https://hosted.weblate.org/projects/ayatana-"
-"indicators/keyboard-applet/he/>\n"
+"Language-Team: Hebrew <https://hosted.weblate.org/projects/"
+"ayatana-indicators/keyboard-applet/he/>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.12-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -39,23 +39,27 @@ msgstr "הצג×Ŗ המל השפה במצב טלפון."
 msgid "Show the language icon in the greeter."
 msgstr "הצג×Ŗ המל השפה במקבל הפנים."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "מקלד×Ŗ"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "מחליף פ×Øיהו×Ŗ והגד×Øו×Ŗ מקלד×Ŗ"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "פ×Ø×™×”×Ŗ המקלד×Ŗ הנוכחי×Ŗ"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "×Ŗמיד להציג מקלד×Ŗ על גבי המהך"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "הגד×Øו×Ŗ מקלד×Ŗā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "הצג×Ŗ הפ×Ø×™×”×” הנוכחי×Ŗ"
 
diff --git a/po/hi.po b/po/hi.po
index dcef6625..3f8896c3 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 972ce40e..cef51038 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,18 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2023-05-21 13:53+0000\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-09-15 20:01+0000\n"
 "Last-Translator: Milo Ivir <mail@milotype.de>\n"
-"Language-Team: Croatian <https://hosted.weblate.org/projects/ayatana-"
-"indicators/keyboard-applet/hr/>\n"
+"Language-Team: Croatian <https://hosted.weblate.org/projects/"
+"ayatana-indicators/keyboard-applet/hr/>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.18-dev\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 5.14-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -40,23 +40,26 @@ msgstr "Prikaži ikonu jezika u telefonskom modusu."
 msgid "Show the language icon in the greeter."
 msgstr "Prikaži ikonu jezika u početnom prozoru."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Tipkovnica"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "Prekidač rasporeda tipkovnice i postavke"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Trenutačni raspored tipkovnice"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "Uvijek prikaži ekransku tipkovnicu"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "Postavke tipkovnice ā€¦"
 
-#: src/service.c:196
-#, fuzzy
+#: src/service.c:207
 msgid "Show Current Layout"
-msgstr "Trenutačni raspored tipkovnice"
+msgstr "Prikaži trenutačni raspored"
diff --git a/po/ht.po b/po/ht.po
index 0ea89961..c8ef1496 100644
--- a/po/ht.po
+++ b/po/ht.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index a5b2a7bf..b8e4f25f 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-02-08 21:50+0000\n"
 "Last-Translator: Ɓcs ZoltƔn <acszoltan111@gmail.com>\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/ayatana-"
@@ -37,24 +37,28 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Billentyűzet"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Jelenlegi billentyűzetkiosztĆ”s"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 #, fuzzy
 msgid "Keyboard Settingsā€¦"
 msgstr "BillentyűzetbeĆ”llĆ­tĆ”sok..."
 
-#: src/service.c:196
+#: src/service.c:207
 #, fuzzy
 msgid "Show Current Layout"
 msgstr "Jelenlegi billentyűzetkiosztĆ”s"
diff --git a/po/hy.po b/po/hy.po
index 2ded91d6..ba8f598b 100644
--- a/po/hy.po
+++ b/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ia.po b/po/ia.po
index 0669f62d..a92392bb 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index a1f47aad..9fb54d1f 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-03-18 17:29+0000\n"
 "Last-Translator: Reza Almanda <rezaalmanda27@gmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/ayatana-"
@@ -37,24 +37,28 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Papan tik"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Tata letak papan tik saat ini"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 #, fuzzy
 msgid "Keyboard Settingsā€¦"
 msgstr "Pengaturan papan tik..."
 
-#: src/service.c:196
+#: src/service.c:207
 #, fuzzy
 msgid "Show Current Layout"
 msgstr "Tata letak papan tik saat ini"
diff --git a/po/is.po b/po/is.po
index 910ed59e..64d9ba03 100644
--- a/po/is.po
+++ b/po/is.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index eb61d07e..3b261505 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2023-06-27 10:56+0000\n"
 "Last-Translator: Sylke Vicious <silkevicious@tuta.io>\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/ayatana-"
@@ -39,23 +39,27 @@ msgstr "Mostra l'icona della lingua in modalitĆ  telefono."
 msgid "Show the language icon in the greeter."
 msgstr "Mostra l'icona della lingua nel saluto."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Tastiera"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "Selettore layout tastiera e impostazioni"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Mappatura di tastiera corrente"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "Impostazioni Tastieraā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 #, fuzzy
 msgid "Show Current Layout"
 msgstr "Mappatura di tastiera corrente"
diff --git a/po/it_CARES.po b/po/it_CARES.po
index 9ce686bd..313a95d8 100644
--- a/po/it_CARES.po
+++ b/po/it_CARES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,22 +35,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index f5ab5251..341af317 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,22 +35,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ka.po b/po/ka.po
index 734fc12c..d7539e9f 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/kk.po b/po/kk.po
index 6465a5ff..3318ad00 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/kl.po b/po/kl.po
index 2465ecd7..74ca462d 100644
--- a/po/kl.po
+++ b/po/kl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/km.po b/po/km.po
index 65811ee0..0d28dedf 100644
--- a/po/km.po
+++ b/po/km.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/kmr.po b/po/kmr.po
index 2bc61e95..83a4428e 100644
--- a/po/kmr.po
+++ b/po/kmr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/kn.po b/po/kn.po
index ab6e3dc6..62b9b6e3 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 466379b8..04f0c863 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2024-03-15 14:01+0000\n"
 "Last-Translator: ģ“ģ •ķ¬ <daemul72@gmail.com>\n"
-"Language-Team: Korean <https://hosted.weblate.org/projects/"
-"ayatana-indicators/keyboard-applet/ko/>\n"
+"Language-Team: Korean <https://hosted.weblate.org/projects/ayatana-"
+"indicators/keyboard-applet/ko/>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,9 @@ msgstr "ė°ģŠ¤ķ¬ķ†± ėŖØė“œģ—ģ„œ ģ–øģ–“ ģ•„ģ“ģ½˜ģ„ ķ‘œģ‹œķ•©ė‹ˆė‹¤."
 msgid ""
 "If enabled, the indicator shows the current layout icon. Otherwise, it "
 "displays a generic keyboard icon."
-msgstr "ķ™œģ„±ķ™”ėœ ź²½ģš° ķ‘œģ‹œė„źµ¬ģ— ķ˜„ģž¬ ė ˆģ“ģ•„ģ›ƒ ģ•„ģ“ģ½˜ģ“ ķ‘œģ‹œė©ė‹ˆė‹¤. ź·øė ‡ģ§€ ģ•Šģœ¼ė©“ "
-"ģ¼ė°˜ ķ‚¤ė³“ė“œ ģ•„ģ“ģ½˜ģ“ ķ‘œģ‹œė©ė‹ˆė‹¤."
+msgstr ""
+"ķ™œģ„±ķ™”ėœ ź²½ģš° ķ‘œģ‹œė„źµ¬ģ— ķ˜„ģž¬ ė ˆģ“ģ•„ģ›ƒ ģ•„ģ“ģ½˜ģ“ ķ‘œģ‹œė©ė‹ˆė‹¤. ź·øė ‡ģ§€ ģ•Šģœ¼ė©“ ģ¼"
+"ė°˜ ķ‚¤ė³“ė“œ ģ•„ģ“ģ½˜ģ“ ķ‘œģ‹œė©ė‹ˆė‹¤."
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:3
 msgid "Show the language icon in phone mode."
@@ -38,22 +39,26 @@ msgstr "ģ „ķ™” ėŖØė“œģ—ģ„œ ģ–øģ–“ ģ•„ģ“ģ½˜ģ„ ķ‘œģ‹œķ•©ė‹ˆė‹¤."
 msgid "Show the language icon in the greeter."
 msgstr "ģøģ‚¬ė§ģ— ģ–øģ–“ ģ•„ģ“ģ½˜ģ„ ķ‘œģ‹œķ•©ė‹ˆė‹¤."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "ķ‚¤ė³“ė“œ"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "ģžķŒ ė°°ģ—“ ģ „ķ™˜źø° ė° ģ„¤ģ •"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "ķ˜„ģž¬ ķ‚¤ė³“ė“œ ė ˆģ“ģ•„ģ›ƒ"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "ķ‚¤ė³“ė“œ ģ„¤ģ •ā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "ķ˜„ģž¬ ģžķŒ ķ‘œģ‹œķ•˜źø°"
diff --git a/po/ku.po b/po/ku.po
index 32963bb0..be27024b 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/kw.po b/po/kw.po
index 8584c724..8c821694 100644
--- a/po/kw.po
+++ b/po/kw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ky.po b/po/ky.po
index af4b8af5..42413c00 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/la.po b/po/la.po
index effc8337..48bffe71 100644
--- a/po/la.po
+++ b/po/la.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/lb.po b/po/lb.po
index 7d5b3370..6139dfe1 100644
--- a/po/lb.po
+++ b/po/lb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/lo.po b/po/lo.po
index a6e000e0..69054a41 100644
--- a/po/lo.po
+++ b/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 305e3a9b..294c48aa 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2023-10-25 23:05+0000\n"
 "Last-Translator: Moo <hazap@hotmail.com>\n"
-"Language-Team: Lithuanian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/keyboard-applet/lt/>\n"
+"Language-Team: Lithuanian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/keyboard-applet/lt/>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,22 +41,26 @@ msgstr "Rodyti kalbos piktogramą telefoniniame režime."
 msgid "Show the language icon in the greeter."
 msgstr "Rodyti kalbos piktogramą pasveikinimo langelyje."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Klaviatūra"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "KlaviatÅ«ros nustatymai ir iÅ”dėstymo perjungiklis"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Dabartinis klaviatÅ«ros iÅ”dėstymas"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "KlaviatÅ«ros nustatymaiā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "Rodyti dabartinÄÆ iÅ”dėstymą"
diff --git a/po/lv.po b/po/lv.po
index 7604463c..823487f9 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -36,22 +36,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/mg.po b/po/mg.po
index 3ad521ad..0d041c5a 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/mhr.po b/po/mhr.po
index b3bc0915..6d28ce38 100644
--- a/po/mhr.po
+++ b/po/mhr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/mi.po b/po/mi.po
index 37f8bb2b..46c083b8 100644
--- a/po/mi.po
+++ b/po/mi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/mk.po b/po/mk.po
index b9204374..68ef5c31 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ml.po b/po/ml.po
index 2def08c6..b2d0bbc7 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/mr.po b/po/mr.po
index daca6894..d6113022 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ms.po b/po/ms.po
index ccef9d4e..0491f770 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/my.po b/po/my.po
index 3cad19e3..3d5d45ed 100644
--- a/po/my.po
+++ b/po/my.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2022-07-15 20:18+0000\n"
 "Last-Translator: Teitei <beilaitei40@gmail.com>\n"
 "Language-Team: Burmese <https://hosted.weblate.org/projects/ayatana-"
@@ -37,22 +37,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "į€€į€®į€øį€˜į€Æį€į€ŗį€”į€•į€¼į€„į€ŗį€”į€†į€„į€ŗį€™į€»į€¬į€øā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index b1386aa4..a80fab9d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,21 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2021-02-23 16:50+0000\n"
-"Last-Translator: Allan NordhĆøy <epost@anotheragency.no>\n"
-"Language-Team: Norwegian BokmƄl <https://hosted.weblate.org/projects/ayatana-"
-"indicators/keyboard-applet/nb_NO/>\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-08-26 19:02+0000\n"
+"Last-Translator: Ida Brenna <ida@larald.no>\n"
+"Language-Team: Norwegian BokmƄl <https://hosted.weblate.org/projects/"
+"ayatana-indicators/keyboard-applet/nb_NO/>\n"
 "Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.5\n"
+"X-Generator: Weblate 5.13\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
-msgstr ""
+msgstr "Vis sprƄkikonet i skrivebordsmodus."
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:2
 msgid ""
@@ -37,24 +37,28 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Tastatur"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Valgt tastaturoppsett"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 #, fuzzy
 msgid "Keyboard Settingsā€¦"
 msgstr "Tastaturinnstillinger ā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 #, fuzzy
 msgid "Show Current Layout"
 msgstr "Valgt tastaturoppsett"
diff --git a/po/ne.po b/po/ne.po
index da69cea6..c4efd93e 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index baad035e..96a444ae 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2023-09-16 20:12+0000\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-02-24 13:08+0000\n"
 "Last-Translator: Heimen Stoffels <vistausss@fastmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/ayatana-indicators/"
 "keyboard-applet/nl/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.10.1-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -39,23 +39,27 @@ msgstr "Toon het taalpictogram in de telefoonmodus."
 msgid "Show the language icon in the greeter."
 msgstr "Toon het taalpictogram op het aanmeldscherm."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Toetsenbord"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "Toetsenbordindelingschakelaar en -instellingen"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Huidige toetsenbordindeling"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "Schermtoetsenbord altijd tonen"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "Toetsenbordinstellingenā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "Huidige indeling tonen"
 
diff --git a/po/nn.po b/po/nn.po
index 97e834f6..f40ce9f1 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,22 +35,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ny.po b/po/ny.po
index 9bf4912a..3e0a88e8 100644
--- a/po/ny.po
+++ b/po/ny.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/oc.po b/po/oc.po
index 79696e5a..90ff49bc 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2023-10-16 04:08+0000\n"
 "Last-Translator: Quentin PAGƈS <quentinantonin@free.fr>\n"
-"Language-Team: Occitan <https://hosted.weblate.org/projects/"
-"ayatana-indicators/keyboard-applet/oc/>\n"
+"Language-Team: Occitan <https://hosted.weblate.org/projects/ayatana-"
+"indicators/keyboard-applet/oc/>\n"
 "Language: oc\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -39,22 +39,26 @@ msgstr "Afichar lā€™icĆ²na de la lenga en mĆ²de telefĆ²n."
 msgid "Show the language icon in the greeter."
 msgstr "Afichar lā€™icĆ²na de la lenga a lā€™acuelhenƧa."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "ClaviĆØr"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "Alternador de disposicions e paramĆØtres claviĆØr"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "AgenƧament actual del claviĆØr"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "ParamĆØtres del claviĆØrā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "Afichar lā€™agenƧament actual"
diff --git a/po/os.po b/po/os.po
index 53b21d04..7c6322c7 100644
--- a/po/os.po
+++ b/po/os.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 52bc9588..20d44fd0 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 77a73fb5..428afdfa 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -36,22 +36,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ps.po b/po/ps.po
index e7deb71b..a4ce80f1 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/pt.po b/po/pt.po
index 09de0b39..90e827ef 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2023-11-09 14:33+0000\n"
-"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-04-06 07:01+0000\n"
+"Last-Translator: ssantos <ssantos@web.de>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/"
 "ayatana-indicators/keyboard-applet/pt/>\n"
 "Language: pt\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.2-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -39,22 +39,26 @@ msgstr "Mostrae o Ć­cone do idioma no modo telefone."
 msgid "Show the language icon in the greeter."
 msgstr "Mostrar o Ć­cone do idioma na saudaĆ§Ć£o."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "Comutador do layout do teclado e ajustes"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "DisposiĆ§Ć£o atual do teclado"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "Sempre mostrar OSK"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "ConfiguraƧƵes do tecladoā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "Mostrar Esquema Atual"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a11ac8ea..0ee29141 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2023-09-16 20:12+0000\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-02-24 06:31+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/"
 "ayatana-indicators/keyboard-applet/pt_BR/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.10.1-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -39,23 +39,27 @@ msgstr "Mostre o Ć­cone do idioma no modo telefone."
 msgid "Show the language icon in the greeter."
 msgstr "Mostre o Ć­cone do idioma na saudaĆ§Ć£o."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "Comutador do layout do teclado e ajustes"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "DisposiĆ§Ć£o atual do teclado"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "Sempre mostrar OSK"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "ConfiguraƧƵes do tecladoā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "Mostrar a disposiĆ§Ć£o atual do teclado"
 
diff --git a/po/ro.po b/po/ro.po
index 84cadfa4..5013838b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,51 +7,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2021-01-22 23:28+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-02-24 06:31+0000\n"
+"Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n"
+"Language-Team: Romanian <https://hosted.weblate.org/projects/"
+"ayatana-indicators/keyboard-applet/ro/>\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
+"X-Generator: Weblate 5.10.1-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
-msgstr ""
+msgstr "Afișează pictograma limbii Ć®n modul de birou."
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:2
 msgid ""
 "If enabled, the indicator shows the current layout icon. Otherwise, it "
 "displays a generic keyboard icon."
 msgstr ""
+"Dacă este activată, indicatorul afișează pictograma aranjamentului curent. "
+"Ǝn caz contrar, este afișată o pictogramă generică de tastatură."
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:3
 msgid "Show the language icon in phone mode."
-msgstr ""
+msgstr "Afișează pictograma limbii Ć®n modul de telefon."
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:4
 msgid "Show the language icon in the greeter."
-msgstr ""
+msgstr "Afișează pictograma de limbă Ć®n fereastra de Ć®ntĆ¢mpinare."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
-msgstr ""
+msgstr "Tastatură"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
-msgstr ""
+msgstr "Comutator aranjament tastatură și configurarea acestuia"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
-msgstr ""
+msgstr "Aranjamentul curent al tastaturii"
+
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "Afișează Ć®ntotdeauna OSK (tastatura pe ecran)"
 
-#: src/service.c:188
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
-msgstr ""
+msgstr "Configurări tastaturăā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
-msgstr ""
+msgstr "Afișează aranjamentul curent"
diff --git a/po/ru.po b/po/ru.po
index 254e2c56..8c999e57 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2023-10-13 04:02+0000\n"
 "Last-Translator: Serhii Horichenko <m@sgg.im>\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/"
-"ayatana-indicators/keyboard-applet/ru/>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/ayatana-"
+"indicators/keyboard-applet/ru/>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,22 +40,26 @@ msgstr "ŠŸŠ¾ŠŗŠ°Š·Š°Ń‚ŃŒ Š·Š½Š°Ń‡Š¾Šŗ яŠ·Ń‹ŠŗŠ° Š² рŠµŠ¶ŠøŠ¼Šµ тŠµŠ»ŠµŃ„Š¾Š½Š
 msgid "Show the language icon in the greeter."
 msgstr "ŠŸŠ¾ŠŗŠ°Š·Ń‹Š²Š°Ń‚ŃŒ Š·Š½Š°Ń‡Š¾Šŗ яŠ·Ń‹ŠŗŠ° Š² ŠæрŠøŠ²ŠµŃ‚стŠ²ŠøŠø."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "ŠšŠ»Š°Š²ŠøŠ°Ń‚ŃƒŃ€Š°"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "ŠŸŠµŃ€ŠµŠŗŠ»ŃŽŃ‡Š°Ń‚ŠµŠ»ŃŒ рŠ°ŃŠŗŠ»Š°Š“ŠŗŠø Šø Š½Š°ŃŃ‚Ń€Š¾Š¹ŠŗŠø ŠŗŠ»Š°Š²ŠøŠ°Ń‚ŃƒŃ€Ń‹"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Š¢ŠµŠŗущŠ°Ń рŠ°ŃŠŗŠ»Š°Š“ŠŗŠ° ŠŗŠ»Š°Š²ŠøŠ°Ń‚ŃƒŃ€Ń‹"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "ŠŠ°ŃŃ‚Ń€Š¾Š¹ŠŗŠø ŠŗŠ»Š°Š²ŠøŠ°Ń‚ŃƒŃ€Ń‹ā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "ŠŸŠ¾ŠŗŠ°Š·Š°Ń‚ŃŒ тŠµŠŗущую рŠ°ŃŠŗŠ»Š°Š“Šŗу ŠŗŠ»Š°Š²ŠøŠ°Ń‚ŃƒŃ€Ń‹"
diff --git a/po/sa.po b/po/sa.po
index a24f47b0..6b8c3baf 100644
--- a/po/sa.po
+++ b/po/sa.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/sc.po b/po/sc.po
index b21807a5..51d39c31 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/sd.po b/po/sd.po
index e8f0ed57..f0ce55ed 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/sdh.po b/po/sdh.po
index 0f2bbbd1..271baea2 100644
--- a/po/sdh.po
+++ b/po/sdh.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/se.po b/po/se.po
index 8aeb18ed..c51369f7 100644
--- a/po/se.po
+++ b/po/se.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/shn.po b/po/shn.po
index 0d3afc81..398d9473 100644
--- a/po/shn.po
+++ b/po/shn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/si.po b/po/si.po
index 159aedd2..971f3fee 100644
--- a/po/si.po
+++ b/po/si.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index c55e2ce2..72fad387 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,22 +35,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 271bcff6..6367111e 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -36,22 +36,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/sq.po b/po/sq.po
index 2fe9c6ed..7283a061 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/sr.po b/po/sr.po
index c7260cc4..748dcfa5 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -36,22 +36,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 2e69835b..f6f628dd 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2023-11-30 10:04+0000\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-04-12 17:05+0000\n"
 "Last-Translator: bittin1ddc447d824349b2 <bittin@reimu.nl>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/"
 "ayatana-indicators/keyboard-applet/sv/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.3-dev\n"
+"X-Generator: Weblate 5.11-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -39,22 +39,26 @@ msgstr "Visa sprƄkikonen i telefonlƤge."
 msgid "Show the language icon in the greeter."
 msgstr "Visa sprƄkikonen i hƤlsaren."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Tangentbord"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "VƤxlare och instƤllningar fƶr tangentbordslayout"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "Nuvarande tangentbordslayout"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "Visa alltid skƤrmtangentbord"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "TangentbordsinstƤllningarā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "Visa nuvarande layout"
diff --git a/po/sw.po b/po/sw.po
index 5e2b4305..4165f72a 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/szl.po b/po/szl.po
index 85a3c077..cc1c8b42 100644
--- a/po/szl.po
+++ b/po/szl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ta.po b/po/ta.po
index 5821d152..0dd18b59 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -7,49 +7,58 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2021-01-22 23:28+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-04-27 02:17+0000\n"
+"Last-Translator: ą®¤ą®®ą®æą®“ąÆą®ØąÆ‡ą®°ą®®ąÆ <anishprabu.t@gmail.com>\n"
+"Language-Team: Tamil <https://hosted.weblate.org/projects/ayatana-indicators/"
+"keyboard-applet/ta/>\n"
 "Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 5.12-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
-msgstr ""
+msgstr "ą®ŸąÆ†ą®šąÆą®•ąÆą®Ÿą®¾ą®ŖąÆ ą®Ŗą®Æą®©ąÆą®®ąÆą®±ąÆˆą®Æą®æą®²ąÆ ą®®ąÆŠą®“ą®æ ą®ą®•ą®¾ą®©ąÆˆą®•ąÆ ą®•ą®¾ą®ŸąÆą®ŸąÆą®™ąÆą®•ą®³ąÆ."
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:2
 msgid ""
 "If enabled, the indicator shows the current layout icon. Otherwise, it "
 "displays a generic keyboard icon."
 msgstr ""
+"ą®‡ą®Æą®•ąÆą®•ą®ŖąÆą®Ŗą®ŸąÆą®Ÿą®¾ą®²ąÆ, ą®•ą®¾ą®ŸąÆą®Ÿą®æ ą®¤ą®±ąÆą®ŖąÆ‹ą®¤ąÆˆą®Æ ą®¤ą®³ą®µą®®ąÆˆą®ŖąÆą®ŖąÆ ą®ą®•ą®¾ą®©ąÆˆą®•ąÆ ą®•ą®¾ą®ŸąÆą®ŸąÆą®•ą®æą®±ą®¤ąÆ. ą®‡ą®²ąÆą®²ąÆˆą®ÆąÆ†ą®©ą®æą®²ąÆ, ą®‡ą®¤ąÆ ą®’ą®°ąÆ "
+"ą®ŖąÆŠą®¤ąÆą®µą®¾ą®© ą®µą®æą®šąÆˆą®ŖąÆą®Ŗą®²ą®•ąÆˆ ą®ą®•ą®¾ą®©ąÆˆą®•ąÆ ą®•ą®¾ą®ŸąÆą®ŸąÆą®•ą®æą®±ą®¤ąÆ."
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:3
 msgid "Show the language icon in phone mode."
-msgstr ""
+msgstr "ą®¤ąÆŠą®²ąÆˆą®ŖąÆ‡ą®šą®æ ą®Ŗą®Æą®©ąÆą®®ąÆą®±ąÆˆą®Æą®æą®²ąÆ ą®®ąÆŠą®“ą®æ ą®ą®•ą®¾ą®©ąÆˆą®•ąÆ ą®•ą®¾ą®ŸąÆą®ŸąÆ."
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:4
 msgid "Show the language icon in the greeter."
-msgstr ""
+msgstr "ą®µą®¾ą®“ąÆą®¤ąÆą®¤ąÆ ą®Øą®æą®±ą®¤ąÆą®¤ą®æą®²ąÆ ą®®ąÆŠą®“ą®æ ą®ą®•ą®¾ą®©ąÆˆą®•ąÆ ą®•ą®¾ą®ŸąÆą®ŸąÆ."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
-msgstr ""
+msgstr "ą®µą®æą®šąÆˆą®ŖąÆą®Ŗą®²ą®•ąÆˆ"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
-msgstr ""
+msgstr "ą®µą®æą®šąÆˆą®ŖąÆą®Ŗą®²ą®•ąÆˆ ą®¤ą®³ą®µą®®ąÆˆą®ŖąÆą®ŖąÆ ą®šąÆą®µą®æą®ŸąÆą®šą®°ąÆ ą®®ą®±ąÆą®±ąÆą®®ąÆ ą®…ą®®ąÆˆą®ŖąÆą®ŖąÆą®•ą®³ąÆ"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
-msgstr ""
+msgstr "ą®¤ą®±ąÆą®ŖąÆ‹ą®¤ąÆˆą®Æ ą®µą®æą®šąÆˆą®ŖąÆą®Ŗą®²ą®•ąÆˆ ą®¤ą®³ą®µą®®ąÆˆą®ŖąÆą®ŖąÆ"
+
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "ą®Žą®ŖąÆą®ŖąÆ‹ą®¤ąÆą®®ąÆ ą®“ą®Žą®šąÆą®•ąÆ‡-ą®ą®•ąÆ ą®•ą®¾ą®ŸąÆą®ŸąÆ"
 
-#: src/service.c:188
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
-msgstr ""
+msgstr "ą®µą®æą®šąÆˆą®ŖąÆą®Ŗą®²ą®•ąÆˆ ą®…ą®®ąÆˆą®ŖąÆą®ŖąÆą®•ą®³ąÆā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
-msgstr ""
+msgstr "ą®¤ą®±ąÆą®ŖąÆ‹ą®¤ąÆˆą®Æ ą®¤ą®³ą®µą®®ąÆˆą®ŖąÆą®ŖąÆˆą®•ąÆ ą®•ą®¾ą®ŸąÆą®ŸąÆ"
diff --git a/po/ta_LK.po b/po/ta_LK.po
index de720398..d8916b8d 100644
--- a/po/ta_LK.po
+++ b/po/ta_LK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/te.po b/po/te.po
index 4f1b8a2d..78d6eefe 100644
--- a/po/te.po
+++ b/po/te.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/tg.po b/po/tg.po
index 9ad2e1c3..ed0a34ba 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/th.po b/po/th.po
index 6ee992ce..ea7d0072 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ti.po b/po/ti.po
index e4c4d66d..96b6da3f 100644
--- a/po/ti.po
+++ b/po/ti.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index ccfc1a66..6e777fe9 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2023-09-16 20:12+0000\n"
 "Last-Translator: Oğuz Ersen <oguz@ersen.moe>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/ayatana-"
@@ -39,23 +39,27 @@ msgstr "Telefon modunda dil simgesini gƶster."
 msgid "Show the language icon in the greeter."
 msgstr "Karşılayıcıda dil simgesini gƶster."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "Klavye"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "Klavye dĆ¼zeni değiştirici ve ayarları"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "GeƧerli klavye dĆ¼zeni"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "Klavye Ayarlarıā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "GeƧerli DĆ¼zeni Gƶster"
 
diff --git a/po/tt.po b/po/tt.po
index 1fbb21e5..693949d2 100644
--- a/po/tt.po
+++ b/po/tt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/ug.po b/po/ug.po
index f1d63ebd..6332b459 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 5c0f24f8..0c61b83c 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,18 +7,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2023-10-13 04:02+0000\n"
-"Last-Translator: Serhii Horichenko <m@sgg.im>\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-03-03 21:19+0000\n"
+"Last-Translator: Serhii Horichenko <serhii@horichenko.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/"
 "ayatana-indicators/keyboard-applet/uk/>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.1-dev\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Weblate 5.10.3-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -40,22 +40,26 @@ msgstr "ŠŸŠ¾ŠŗŠ°Š·ŃƒŠ²Š°Ń‚Šø Š·Š½Š°Ń‡Š¾Šŗ Š¼Š¾Š²Šø Š² рŠµŠ¶ŠøŠ¼Ń– тŠµŠ»ŠµŃ„Š¾Š
 msgid "Show the language icon in the greeter."
 msgstr "ŠŸŠ¾ŠŗŠ°Š·ŃƒŠ²Š°Ń‚Šø Š·Š½Š°Ń‡Š¾Šŗ Š¼Š¾Š²Šø у Š²Ń–Ń‚Š°Š»ŃŒŠ½Š¾Š¼Ńƒ ŠæŠ¾Š²Ń–Š“Š¾Š¼Š»ŠµŠ½Š½Ń–."
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "ŠšŠ»Š°Š²Ń–Š°Ń‚ŃƒŃ€Š°"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "ŠŸŠµŃ€ŠµŠ¼ŠøŠŗŠ°Ń‡ рŠ¾Š·ŠŗŠ»Š°Š“ŠŗŠø тŠ° Š½Š°Š»Š°ŃˆŃ‚ŃƒŠ²Š°Š½Š½Ń ŠŗŠ»Š°Š²Ń–Š°Ń‚ŃƒŃ€Šø"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "ŠŸŠ¾Ń‚Š¾Ń‡Š½Š° рŠ¾Š·ŠŗŠ»Š°Š“ŠŗŠ° ŠŗŠ»Š°Š²Ń–Š°Ń‚ŃƒŃ€Šø"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "Š—Š°Š²Š¶Š“Šø ŠæŠ¾ŠŗŠ°Š·ŃƒŠ²Š°Ń‚Šø ŠµŠŗрŠ°Š½Š½Ńƒ ŠŗŠ»Š°Š²Ń–Š°Ń‚ŃƒŃ€Ńƒ"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "ŠŠ°Š»Š°ŃˆŃ‚ŃƒŠ²Š°Š½Š½Ń ŠŗŠ»Š°Š²Ń–Š°Ń‚ŃƒŃ€Šøā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "ŠŸŠ¾ŠŗŠ°Š·Š°Ń‚Šø ŠæŠ¾Ń‚Š¾Ń‡Š½Ńƒ рŠ¾Š·ŠŗŠ»Š°Š“Šŗу ŠŗŠ»Š°Š²Ń–Š°Ń‚ŃƒŃ€Šø"
diff --git a/po/ur.po b/po/ur.po
index 8f2cb842..5562c5d7 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/uz.po b/po/uz.po
index bd9ac3e3..9b276dd6 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/vec.po b/po/vec.po
index 3be02d78..48395084 100644
--- a/po/vec.po
+++ b/po/vec.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 354fd437..997b2cd9 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -35,22 +35,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/wae.po b/po/wae.po
index 9c7eab8a..af1a2012 100644
--- a/po/wae.po
+++ b/po/wae.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/wo.po b/po/wo.po
index 3a2d4113..24e6aed0 100644
--- a/po/wo.po
+++ b/po/wo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 02bc6c61..953cb744 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2024-04-01 22:37+0000\n"
-"Last-Translator: 复äŗˆ <clonewith@qq.com>\n"
-"Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
-"ayatana-indicators/keyboard-applet/zh_Hans/>\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2025-07-13 05:01+0000\n"
+"Last-Translator: \"Alioc.\" <hit.177411245@gmail.com>\n"
+"Language-Team: Chinese (Simplified Han script) <https://hosted.weblate.org/"
+"projects/ayatana-indicators/keyboard-applet/zh_Hans/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.5-dev\n"
+"X-Generator: Weblate 5.13-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
@@ -37,22 +37,26 @@ msgstr "åœØē§»åŠØč®¾å¤‡ęؔ式äøŠę˜¾ē¤ŗčÆ­čØ€å›¾ę ‡ć€‚"
 msgid "Show the language icon in the greeter."
 msgstr "ꖰē”Øęˆ·ę˜¾ē¤ŗčÆ­čØ€å›¾ę ‡ć€‚"
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr "键ē›˜"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr "键ē›˜åøƒå±€åˆ‡ę¢å™Øå’Œč®¾ē½®"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr "当前键ē›˜åøƒå±€"
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr "ꀻę˜Æę˜¾ē¤ŗ OSK"
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "键ē›˜č®¾ē½®ā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr "ę˜¾ē¤ŗ当前åøƒå±€"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 1be39a87..b566b85f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2021-01-22 23:28+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,22 +34,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr ""
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/zh_LATN@pinyin.po b/po/zh_LATN@pinyin.po
index 35cabb84..79cff757 100644
--- a/po/zh_LATN@pinyin.po
+++ b/po/zh_LATN@pinyin.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
 "PO-Revision-Date: 2023-01-07 17:51+0000\n"
 "Last-Translator: Andy Chiang <andy.chiang.13@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -37,22 +37,26 @@ msgstr ""
 msgid "Show the language icon in the greeter."
 msgstr ""
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
 msgstr ""
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
 msgstr ""
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:193
+msgid "Always show OSK"
+msgstr ""
+
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
 msgstr "键ē›˜č®¾ē½®ā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 507e83b9..92b3e15c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,49 +7,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-10 23:57+0200\n"
-"PO-Revision-Date: 2021-01-22 23:28+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2025-02-23 19:05+0100\n"
+"PO-Revision-Date: 2024-10-31 03:08+0000\n"
+"Last-Translator: hugoalh <hugoalh@users.noreply.hosted.weblate.org>\n"
+"Language-Team: Chinese (Traditional Han script) <https://hosted.weblate.org/"
+"projects/ayatana-indicators/keyboard-applet/zh_Hant/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 5.8.2-dev\n"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:1
 msgid "Show the language icon in desktop mode."
-msgstr ""
+msgstr "åœØę”Œé¢ęؔ式äø‹é”Æē¤ŗčŖžč؀圖ē¤ŗ怂"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:2
 msgid ""
 "If enabled, the indicator shows the current layout icon. Otherwise, it "
 "displays a generic keyboard icon."
-msgstr ""
+msgstr "å¦‚ęžœå•Ÿē”Øļ¼ŒęŒ‡ē¤ŗå™Ø꜃é”Æē¤ŗē›®å‰ē‰ˆé¢åœ–ē¤ŗļ¼Œå¦å‰‡ęœƒé”Æē¤ŗ通ē”Ø鍵ē›¤åœ–ē¤ŗ怂"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:3
 msgid "Show the language icon in phone mode."
-msgstr ""
+msgstr "åœØ電話ęؔ式äø‹é”Æē¤ŗčŖžč؀圖ē¤ŗ怂"
 
 #: data/org.ayatana.indicator.keyboard.gschema.xml:4
 msgid "Show the language icon in the greeter."
-msgstr ""
+msgstr "åœØ問候介面äø­é”Æē¤ŗčŖžč؀圖ē¤ŗ怂"
 
-#: src/service.c:93
+#: src/service.c:95
 msgid "Keyboard"
-msgstr ""
+msgstr "鍵ē›¤"
 
-#: src/service.c:94
+#: src/service.c:96
 msgid "Keyboard layout switcher and settings"
-msgstr ""
+msgstr "鍵ē›¤ē‰ˆé¢åˆ‡ę›å™Ø和čح定"
 
-#: src/service.c:131
+#: src/service.c:133
 msgid "Current keyboard layout"
+msgstr "ē›®å‰éµē›¤ē‰ˆé¢"
+
+#: src/service.c:193
+msgid "Always show OSK"
 msgstr ""
 
-#: src/service.c:188
+#: src/service.c:199
 msgid "Keyboard Settingsā€¦"
-msgstr ""
+msgstr "鍵ē›¤čح定ā€¦"
 
-#: src/service.c:196
+#: src/service.c:207
 msgid "Show Current Layout"
-msgstr ""
+msgstr "é”Æē¤ŗē›®å‰ē‰ˆé¢"
diff --git a/src/keyboard-lomiri.c b/src/keyboard-lomiri.c
index 637bb9f4..176d576b 100644
--- a/src/keyboard-lomiri.c
+++ b/src/keyboard-lomiri.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2024 Robert Tari <robert@tari.in>
+ * Copyright 2021-2025 Robert Tari <robert@tari.in>
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -17,8 +17,36 @@
 #include <act/act.h>
 #include <xkbcommon/xkbregistry.h>
 #include <glib-object.h>
+#include <libudev.h>
 #include "languages.h"
 #include "keyboard.h"
+#include "system-layouts.h"
+
+gchar *LOMIRI_TO_ISO[][2] =
+{
+    {"ar", "ara"},
+    {"bn", "bd"},
+    {"bn-probhat", "bd+probhat"},
+    {"bs", "ba"},
+    {"cs", "cz"},
+    {"da", "dk"},
+    {"el", "gr"},
+    {"en", "us"},
+    {"endv", "us+dvorak"},
+    {"eo", "epo"},
+    {"fa", "ir"},
+    {"fr-ch", "ch+fr"},
+    {"gd", "gb+gla"},
+    {"he", "il"},
+    {"ja", "jp"},
+    {"ko", "kr"},
+    {"nb", "no"},
+    {"sl", "si"},
+    {"sr", "rs"},
+    {"sv", "se"},
+    {"uk", "ua"},
+    {NULL, NULL}
+};
 
 enum
 {
@@ -33,9 +61,18 @@ struct _KeyboardPrivate
 {
     GHashTable *lLayouts;
     guint nLayout;
+    guint nLayoutOSK;
     GSList *lLayoutRec;
+    GSList *lLayoutRecOSK;
     GSList *lUsers;
     GSettings *pSettings;
+    struct udev *pUdev;
+    struct udev_monitor *pMonitor;
+    GIOChannel *pChannel;
+    gboolean bHardwareKeyboard;
+    gboolean bSoftwareKeyboard;
+    GSettings *pLomiriSettings;
+    GSettings *pMaliitSettings;
 };
 
 typedef KeyboardPrivate priv_t;
@@ -168,24 +205,57 @@ void keyboard_AddSource(Keyboard *pKeyboard)
     return;
 }
 
-guint keyboard_GetNumLayouts(Keyboard *pKeyboard)
+guint keyboard_GetNumLayouts(Keyboard *pKeyboard, gboolean bOSK)
 {
-    return g_slist_length (pKeyboard->pPrivate->lLayoutRec);
+    guint nLayouts = 0;
+
+    if (bOSK)
+    {
+        nLayouts = g_slist_length (pKeyboard->pPrivate->lLayoutRecOSK);
+    }
+    else
+    {
+        nLayouts = g_slist_length (pKeyboard->pPrivate->lLayoutRec);
+    }
+
+    return nLayouts;
 }
 
-guint keyboard_GetLayoutIndex (Keyboard *pKeyboard)
+guint keyboard_GetLayoutIndex (Keyboard *pKeyboard, gboolean bOSK)
 {
-    return pKeyboard->pPrivate->nLayout;
+    if (bOSK)
+    {
+        return pKeyboard->pPrivate->nLayoutOSK;
+    }
+    else
+    {
+        return pKeyboard->pPrivate->nLayout;
+    }
 }
 
-void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gchar **pDescription)
+void keyboard_GetLayout(Keyboard *pKeyboard, gboolean bOSK, gint nLayout, gchar **pLanguage, gchar **pDescription, gchar **pId)
 {
-    if (nLayout == -1)
+
+    GSList *lLayoutRec = NULL;
+
+    if (bOSK)
+    {
+        if (nLayout == -1)
+        {
+            nLayout = pKeyboard->pPrivate->nLayoutOSK;
+        }
+        lLayoutRec = pKeyboard->pPrivate->lLayoutRecOSK;
+    }
+    else
     {
-        nLayout = pKeyboard->pPrivate->nLayout;
+        if (nLayout == -1)
+        {
+            nLayout = pKeyboard->pPrivate->nLayout;
+        }
+        lLayoutRec = pKeyboard->pPrivate->lLayoutRec;
     }
 
-    gchar *sLayout = g_slist_nth_data (pKeyboard->pPrivate->lLayoutRec, nLayout);
+    gchar *sLayout = g_slist_nth_data (lLayoutRec, nLayout);
     const Layout *pLayout;
     g_hash_table_lookup_extended(pKeyboard->pPrivate->lLayouts, sLayout, NULL, (gpointer*)&pLayout);
 
@@ -198,9 +268,14 @@ void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gc
     {
         *pDescription = g_strdup(pLayout->sDescription);
     }
+
+    if (pId != NULL)
+    {
+        *pId = g_strdup (sLayout);
+    }
 }
 
-void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout)
+void keyboard_SetLayoutHardware(Keyboard *pKeyboard, gint nLayout)
 {
     if (isGreeter() == FALSE)
     {
@@ -292,11 +367,103 @@ void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout)
     }
 }
 
+void keyboard_SetLayoutSoftware(Keyboard *pKeyboard, gint nLayout)
+{
+    if (isGreeter() == FALSE)
+    {
+        gchar *sId = g_slist_nth_data (pKeyboard->pPrivate->lLayoutRecOSK, nLayout);
+        guint nId = 0;
+        gchar *sLayoutOSK = NULL;
+
+        while (LOMIRI_TO_ISO[nId][0] != NULL)
+        {
+            gboolean bEqual = g_str_equal (LOMIRI_TO_ISO[nId][1], sId);
+
+            if (bEqual)
+            {
+                sLayoutOSK = LOMIRI_TO_ISO[nId][0];
+
+                break;
+            }
+
+            nId++;
+        }
+
+        if (!sLayoutOSK)
+        {
+            sLayoutOSK = sId;
+        }
+
+        guint nEnabledLayoutsOSK = g_slist_length (pKeyboard->pPrivate->lLayoutRecOSK);
+
+        GVariantBuilder cLayoutsOSKBuilder;
+        g_variant_builder_init (&cLayoutsOSKBuilder, G_VARIANT_TYPE ("as"));
+        if (sLayoutOSK)
+        {
+            g_variant_builder_add (&cLayoutsOSKBuilder, "s", sLayoutOSK);
+        }
+
+        for (guint nLayout = 0; nLayout < nEnabledLayoutsOSK; nLayout++)
+        {
+            gchar *sIdIso = g_slist_nth_data (pKeyboard->pPrivate->lLayoutRecOSK, nLayout);
+
+            nId = 0;
+            gchar *sIdLomiri = NULL;
+            while (LOMIRI_TO_ISO[nId][0] != NULL)
+            {
+                gboolean bEqual = g_str_equal (LOMIRI_TO_ISO[nId][1], sIdIso);
+
+                if (bEqual)
+                {
+                    sIdLomiri = LOMIRI_TO_ISO[nId][0];
+
+                    break;
+                }
+
+                nId++;
+            }
+            if (!sIdLomiri)
+            {
+                sIdLomiri = sIdIso;
+            }
+
+            if (strcmp(sIdLomiri, sLayoutOSK))
+            {
+                g_variant_builder_add (&cLayoutsOSKBuilder, "s", sIdLomiri);
+            }
+        }
+        GVariant *pEnabledLayoutsOSK = g_variant_builder_end (&cLayoutsOSKBuilder);
+
+        g_settings_set_string (pKeyboard->pPrivate->pMaliitSettings, "active-language", sLayoutOSK);
+        g_settings_set_value (pKeyboard->pPrivate->pMaliitSettings, "enabled-languages", pEnabledLayoutsOSK);
+    }
+    else
+    {
+        // TODO
+    }
+}
+
+void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout, gboolean bOSK)
+{
+    if (bOSK)
+    {
+        keyboard_SetLayoutSoftware(pKeyboard, nLayout);
+    }
+    else
+    {
+        keyboard_SetLayoutHardware(pKeyboard, nLayout);
+    }
+}
+
 static void onDispose(GObject *pObject)
 {
     Keyboard *self = G_KEYBOARD(pObject);
     g_signal_handlers_disconnect_by_data (self->pPrivate->pSettings, self);
     g_clear_object (&self->pPrivate->pSettings);
+    g_signal_handlers_disconnect_by_data (self->pPrivate->pLomiriSettings, self);
+    g_clear_object (&self->pPrivate->pLomiriSettings);
+    g_signal_handlers_disconnect_by_data (self->pPrivate->pMaliitSettings, self);
+    g_clear_object (&self->pPrivate->pMaliitSettings);
 
     if (self->pPrivate->lLayouts)
     {
@@ -308,11 +475,31 @@ static void onDispose(GObject *pObject)
         g_slist_free_full(self->pPrivate->lLayoutRec, g_free);
     }
 
+    if (self->pPrivate->lLayoutRecOSK)
+    {
+        g_slist_free_full (self->pPrivate->lLayoutRecOSK, g_free);
+    }
+
     if (self->pPrivate->lUsers)
     {
         g_slist_free(self->pPrivate->lUsers);
     }
 
+    if (self->pPrivate->pChannel)
+    {
+        g_io_channel_unref (self->pPrivate->pChannel);
+    }
+
+    if (self->pPrivate->pMonitor)
+    {
+        udev_monitor_unref (self->pPrivate->pMonitor);
+    }
+
+    if (self->pPrivate->pUdev)
+    {
+        udev_unref (self->pPrivate->pUdev);
+    }
+
     G_OBJECT_CLASS(keyboard_parent_class)->dispose(pObject);
 }
 
@@ -370,9 +557,150 @@ static void onSourcesChanged (GSettings *pSettings, const gchar *sKey, gpointer
     }
 }
 
+static void onSoftwareKeyboardEnabled (GSettings *pSettings, const gchar *sKey, gpointer pData)
+{
+    Keyboard *self = G_KEYBOARD (pData);
+    self->pPrivate->bSoftwareKeyboard = g_settings_get_boolean (pSettings, "always-show-osk");
+    g_signal_emit (self, m_lSignals[CONFIG_CHANGED], 0);
+    g_signal_emit (self, m_lSignals[LAYOUT_CHANGED], 0);
+}
+
+static void onSoftwareLayoutChanged (GSettings *pSettings, const gchar *sKey, gpointer pData)
+{
+    Keyboard *pKeyboard = G_KEYBOARD (pData);
+    g_signal_emit (pKeyboard, m_lSignals[LAYOUT_CHANGED], 0);
+}
+
+static void onSoftwareLayoutsChanged (GSettings *pSettings, const gchar *sKey, gpointer pData)
+{
+    Keyboard *pKeyboard = G_KEYBOARD (pData);
+    gboolean bsignal = FALSE;
+
+    if (pKeyboard->pPrivate->lLayoutRecOSK)
+    {
+        g_slist_free_full (g_steal_pointer (&pKeyboard->pPrivate->lLayoutRecOSK), g_free);
+        bsignal = TRUE;
+    }
+
+    GStrv lLayouts = g_settings_get_strv (pSettings, "enabled-languages");
+    guint nLayouts = g_strv_length (lLayouts);
+
+    if (lLayouts)
+    {
+        for (guint nLayout = 0; nLayout < nLayouts; nLayout++)
+        {
+            guint nId = 0;
+            gchar *sLayout = NULL;
+
+            while (LOMIRI_TO_ISO[nId][0] != NULL)
+            {
+                gboolean bEqual = g_str_equal (LOMIRI_TO_ISO[nId][0], lLayouts[nLayout]);
+
+                if (bEqual)
+                {
+                    sLayout = g_strdup (LOMIRI_TO_ISO[nId][1]);
+
+                    break;
+                }
+
+                nId++;
+            }
+
+            if (!sLayout)
+            {
+                sLayout = g_strdup (lLayouts[nLayout]);
+            }
+
+            pKeyboard->pPrivate->lLayoutRecOSK = g_slist_append (pKeyboard->pPrivate->lLayoutRecOSK, sLayout);
+        }
+
+        g_strfreev (lLayouts);
+    }
+
+    if (bsignal)
+    {
+        g_signal_emit (pKeyboard, m_lSignals[CONFIG_CHANGED], 0);
+        g_signal_emit (pKeyboard, m_lSignals[LAYOUT_CHANGED], 0);
+    }
+}
+
+static bool udevDeviceIsHardwareKeyboard (struct udev_device *pDevice)
+{
+    const gchar *sValue = udev_device_get_property_value (pDevice, "ID_INPUT_KEYBOARD");
+    gint nCompared = g_strcmp0 (sValue, "1");
+
+    return nCompared == 0;
+}
+
+static gboolean udevHasHardwareKeyboard (struct udev *pUdev)
+{
+    struct udev_enumerate *pEnumerate = udev_enumerate_new (pUdev);
+    udev_enumerate_add_match_subsystem (pEnumerate, "input");
+    udev_enumerate_scan_devices (pEnumerate);
+    struct udev_list_entry *lEntries = udev_enumerate_get_list_entry (pEnumerate);
+    struct udev_list_entry *pEntry;
+    gboolean bFound = FALSE;
+
+    udev_list_entry_foreach (pEntry, lEntries)
+    {
+        const gchar *sPath = udev_list_entry_get_name (pEntry);
+        struct udev_device *pDevice = udev_device_new_from_syspath (pUdev, sPath);
+        gboolean bKeyboard = udevDeviceIsHardwareKeyboard (pDevice);
+
+        if (bKeyboard)
+        {
+            bFound = TRUE;
+            udev_device_unref (pDevice);
+
+            break;
+        }
+
+        udev_device_unref (pDevice);
+    }
+
+    udev_enumerate_unref (pEnumerate);
+
+    return bFound;
+}
+
+static gboolean onUdevEvent (GIOChannel *pChannel, GIOCondition nCondition, gpointer pData)
+{
+    Keyboard *self = G_KEYBOARD (pData);
+    struct udev_device *pDevice = udev_monitor_receive_device (self->pPrivate->pMonitor);
+
+    if (pDevice)
+    {
+        gboolean bKeyboard = udevDeviceIsHardwareKeyboard (pDevice);
+
+        if (bKeyboard)
+        {
+            struct udev *pUdev = udev_device_get_udev (pDevice);
+            self->pPrivate->bHardwareKeyboard = udevHasHardwareKeyboard (pUdev);
+            g_signal_emit (self, m_lSignals[CONFIG_CHANGED], 0);
+            g_signal_emit (self, m_lSignals[LAYOUT_CHANGED], 0);
+        }
+
+        udev_device_unref (pDevice);
+    }
+
+    return TRUE;
+}
+
+gboolean keyboard_hasHardwareKeyboard (Keyboard *self)
+{
+    return self->pPrivate->bHardwareKeyboard;
+}
+
+gboolean keyboard_hasSoftwareKeyboard (Keyboard *self)
+{
+    return self->pPrivate->bSoftwareKeyboard;
+}
+
 static void keyboard_init(Keyboard *self)
 {
     self->pPrivate = keyboard_get_instance_private(self);
+    self->pPrivate->lLayoutRec = NULL;
+    self->pPrivate->lLayoutRecOSK = NULL;
     self->pPrivate->lLayouts = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, freeLayout);
 
     // Read all available layouts
@@ -420,6 +748,27 @@ static void keyboard_init(Keyboard *self)
 
     rxkb_context_unref(pContext);
 
+    self->pPrivate->nLayoutOSK = 0;
+
+    // Lomiri-specific layouts
+    const gchar *LAYOUTS[][3] =
+    {
+        {"emoji", "emoji", "Emoji"},
+        {"Bn", "bn-avro", "Bangla (Avro)"},
+        {"Zn", "chewing", "Chinese (Chewing)"},
+        {"Zn", "pinyin", "Chinese (Pinyin)"}
+    };
+
+    for (guint nLayout = 0; nLayout < 3; nLayout++)
+    {
+        Layout *pLayout = g_slice_new0 (Layout);
+        pLayout->sId = g_strdup (LAYOUTS[nLayout][1]);
+        pLayout->sLanguage = g_strdup (LAYOUTS[nLayout][0]);
+        pLayout->sDescription = g_strdup (LAYOUTS[nLayout][2]);
+        g_hash_table_replace (self->pPrivate->lLayouts, pLayout->sId, pLayout);
+    }
+    //~Lomiri-specific layouts
+
     if (isGreeter() == FALSE)
     {
         self->pPrivate->nLayout = 0;
@@ -445,111 +794,22 @@ static void keyboard_init(Keyboard *self)
     }
     else
     {
-        // Get layouts from /etc/default/keyboard
-        gchar *sFile;
-        g_file_get_contents ("/etc/default/keyboard", &sFile, NULL, NULL);
-        gchar **lLines = g_strsplit(sFile, "\n", -1);
-        guint nLines = g_strv_length(lLines);
-        gchar **lLayouts = NULL;
-        gchar **lVariants = NULL;
-
-        for (guint nLine = 0; nLine < nLines; nLine++)
-        {
-            gboolean bIsLayout = g_str_has_prefix(lLines[nLine], "XKBLAYOUT");
+        // Get system layouts
+        getSystemLayouts ("/etc/default/keyboard", &self->pPrivate->lLayoutRec, NULL, FALSE);
 
-            if (bIsLayout == TRUE)
-            {
-                gboolean bQuoted = g_strrstr(lLines[nLine], "\"") != NULL;
-                gchar *sLayout = NULL;
-
-                if (bQuoted == TRUE)
-                {
-                    sLayout = (lLines[nLine] + 11);
-                    guint nLength = strlen(sLayout);
-                    sLayout[nLength - 1] = '\0';
-                }
-                else
-                {
-                    sLayout = (lLines[nLine] + 10);
-                }
-
-                lLayouts = g_strsplit(sLayout, ",", -1);
-
-                continue;
-            }
-
-            gboolean bIsVariant = g_str_has_prefix(lLines[nLine], "XKBVARIANT");
-
-            if (bIsVariant == TRUE)
-            {
-                gboolean bQuoted = g_strrstr(lLines[nLine], "\"") != NULL;
-                gchar *sVariant = NULL;
-
-                if (bQuoted == TRUE)
-                {
-                    sVariant = (lLines[nLine] + 12);
-                    guint nLength = strlen(sVariant);
-                    sVariant[nLength - 1] = '\0';
-                }
-                else
-                {
-                    sVariant = (lLines[nLine] + 11);
-                }
-
-                lVariants = g_strsplit(sVariant, ",", -1);
-
-                continue;
-            }
-        }
-
-        guint nVariants = 0;
-
-        if (lVariants != NULL)
+        if (!self->pPrivate->lLayoutRec)
         {
-            g_strv_length(lVariants);
+            getSystemLayouts ("/etc/X11/xorg.conf.d/00-keyboard.conf", &self->pPrivate->lLayoutRec, NULL, FALSE);
         }
 
-        if (lLayouts != NULL)
+        if (!self->pPrivate->lLayoutRec)
         {
-            guint nLayouts = g_strv_length(lLayouts);
-
-            for (guint nLayout = 0; nLayout < nLayouts; nLayout++)
-            {
-                gchar *sId = NULL;
-
-                if (nVariants > nLayout)
-                {
-                    guint nVariant = strlen(lVariants[nLayout]);
-
-                    if (nVariants == nLayouts && nVariant > 0)
-                    {
-                        sId = g_strconcat(lLayouts[nLayout], "+", lVariants[nLayout], NULL);
-                    }
-                    else
-                    {
-                        sId = g_strdup(lLayouts[nLayout]);
-                    }
-                }
-                else
-                {
-                    sId = g_strdup(lLayouts[nLayout]);
-                }
-
-                self->pPrivate->lLayoutRec = g_slist_append(self->pPrivate->lLayoutRec, sId);
-            }
-
-            self->pPrivate->nLayout = 0;
-
-            g_strfreev(lLayouts);
-        }
-
-        if (lVariants != NULL)
-        {
-            g_strfreev(lVariants);
+            gchar *sId = g_strdup ("us");
+            self->pPrivate->lLayoutRec = g_slist_append (self->pPrivate->lLayoutRec, sId);
         }
 
-        g_strfreev(lLines);
-        g_free(sFile);
+        self->pPrivate->nLayout = 0;
+        //~ Get system layouts
 
         ActUserManager *pManager = act_user_manager_get_default();
         gboolean bIsLoaded;
@@ -579,4 +839,53 @@ static void keyboard_init(Keyboard *self)
             g_signal_connect_object(pManager, "notify::is-loaded", G_CALLBACK(onManagerLoaded), self, G_CONNECT_SWAPPED);
         }
     }
+
+    // Watch for a hardware keyboard
+    self->pPrivate->pUdev = udev_new ();
+    self->pPrivate->pMonitor = udev_monitor_new_from_netlink (self->pPrivate->pUdev, "udev");
+    udev_monitor_filter_add_match_subsystem_devtype (self->pPrivate->pMonitor, "input", NULL);
+    udev_monitor_enable_receiving (self->pPrivate->pMonitor);
+    gint nFd = udev_monitor_get_fd (self->pPrivate->pMonitor);
+    self->pPrivate->bHardwareKeyboard = udevHasHardwareKeyboard (self->pPrivate->pUdev);
+    self->pPrivate->pChannel = g_io_channel_unix_new (nFd);
+    g_io_add_watch (self->pPrivate->pChannel, G_IO_IN, onUdevEvent, self);
+    //~Watch for a hardware keyboard
+
+    // Watch software keyboard
+    GSettingsSchemaSource *pSource = g_settings_schema_source_get_default ();
+    GSettingsSchema *pSchema = NULL;
+
+    if (pSource)
+    {
+        pSchema = g_settings_schema_source_lookup (pSource, "com.lomiri.Shell", FALSE);
+
+        if (pSchema)
+        {
+            g_settings_schema_unref (pSchema);
+            self->pPrivate->pLomiriSettings = g_settings_new ("com.lomiri.Shell");
+            g_signal_connect (self->pPrivate->pLomiriSettings, "changed::always-show-osk", G_CALLBACK (onSoftwareKeyboardEnabled), self);
+            onSoftwareKeyboardEnabled (self->pPrivate->pLomiriSettings, "always-show-osk", self);
+        }
+        else
+        {
+            g_error ("Panic: no com.lomiri.Shell schema found");
+        }
+
+        pSchema = g_settings_schema_source_lookup (pSource, "com.lomiri.keyboard.maliit", FALSE);
+
+        if (pSchema)
+        {
+            g_settings_schema_unref (pSchema);
+            self->pPrivate->pMaliitSettings = g_settings_new ("com.lomiri.keyboard.maliit");
+            g_signal_connect (self->pPrivate->pMaliitSettings, "changed::enabled-languages", G_CALLBACK (onSoftwareLayoutsChanged), self);
+            onSoftwareLayoutsChanged (self->pPrivate->pMaliitSettings, "enabled-languages", self);
+            g_signal_connect (self->pPrivate->pMaliitSettings, "changed::active-language", G_CALLBACK (onSoftwareLayoutChanged), self);
+            onSoftwareLayoutChanged (self->pPrivate->pMaliitSettings, "active-language", self);
+        }
+        else
+        {
+            g_error ("Panic: no com.lomiri.keyboard.maliit schema found");
+        }
+    }
+    //~Watch software keyboard
 }
diff --git a/src/keyboard-x11.c b/src/keyboard-x11.c
index d0a445e8..75dabd6d 100644
--- a/src/keyboard-x11.c
+++ b/src/keyboard-x11.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Robert Tari <robert@tari.in>
+ * Copyright 2021-2025 Robert Tari <robert@tari.in>
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -20,6 +20,7 @@
 #include <libxklavier/xklavier.h>
 #include "languages.h"
 #include "keyboard.h"
+#include "system-layouts.h"
 
 #define GREETER_BUS_NAME "org.ayatana.greeter"
 #define GREETER_BUS_PATH "/org/ayatana/greeter"
@@ -41,6 +42,7 @@ struct _KeyboardPrivate
     GHashTable *lLayouts;
     Display *pDisplay;
     guint nLayout;
+    guint nLayoutOSK;
     gint nXkbEventType;
     XklConfigRec *pConfigRec;
     GSList *lLayoutRec;
@@ -48,7 +50,7 @@ struct _KeyboardPrivate
     GDBusConnection *pConnection;
     guint nSubscription;
     gchar *sUser;
-    gchar *sSystemLayout;
+    GStrv lSystemLayouts;
 };
 
 typedef KeyboardPrivate priv_t;
@@ -148,7 +150,13 @@ static void getAccountsService(Keyboard *pKeyboard, ActUser *pUser)
             g_slist_free_full (g_steal_pointer (&pKeyboard->pPrivate->lLayoutRec), g_free);
         }
 
-        pKeyboard->pPrivate->lLayoutRec = g_slist_append (pKeyboard->pPrivate->lLayoutRec, g_strdup (pKeyboard->pPrivate->sSystemLayout));
+        guint nLayouts = g_strv_length (pKeyboard->pPrivate->lSystemLayouts);
+
+        for (guint nLayout = 0; nLayout < nLayouts; nLayout++)
+        {
+            pKeyboard->pPrivate->lLayoutRec = g_slist_append (pKeyboard->pPrivate->lLayoutRec, g_strdup (pKeyboard->pPrivate->lSystemLayouts[nLayout]));
+        }
+
         g_timeout_add(500, (GSourceFunc)emitDelayedSignal, pKeyboard);
     }
     else
@@ -187,7 +195,12 @@ static void getAccountsService(Keyboard *pKeyboard, ActUser *pUser)
 
             if (!nLayouts)
             {
-                pKeyboard->pPrivate->lLayoutRec = g_slist_append (pKeyboard->pPrivate->lLayoutRec, g_strdup (pKeyboard->pPrivate->sSystemLayout));
+                guint nLayouts = g_strv_length (pKeyboard->pPrivate->lSystemLayouts);
+
+                for (guint nLayout = 0; nLayout < nLayouts; nLayout++)
+                {
+                    pKeyboard->pPrivate->lLayoutRec = g_slist_append (pKeyboard->pPrivate->lLayoutRec, g_strdup (pKeyboard->pPrivate->lSystemLayouts[nLayout]));
+                }
             }
 
             g_variant_iter_free(pIter);
@@ -357,7 +370,7 @@ void keyboard_AddSource(Keyboard *pKeyboard)
     }
 }
 
-guint keyboard_GetNumLayouts(Keyboard *pKeyboard)
+guint keyboard_GetNumLayouts(Keyboard *pKeyboard, gboolean bOSK)
 {
     guint nLayouts = 0;
 
@@ -373,12 +386,12 @@ guint keyboard_GetNumLayouts(Keyboard *pKeyboard)
     return nLayouts;
 }
 
-guint keyboard_GetLayoutIndex (Keyboard *pKeyboard)
+guint keyboard_GetLayoutIndex (Keyboard *pKeyboard, gboolean bOSK)
 {
     return pKeyboard->pPrivate->nLayout;
 }
 
-void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gchar **pDescription)
+void keyboard_GetLayout(Keyboard *pKeyboard, gboolean bOSK, gint nLayout, gchar **pLanguage, gchar **pDescription, gchar **pId)
 {
     if (nLayout == -1)
     {
@@ -420,10 +433,17 @@ void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gc
         *pDescription = g_strdup(pLayout->sDescription);
     }
 
-    g_free(sId);
+    if (pId != NULL)
+    {
+        *pId = sId;
+    }
+    else
+    {
+        g_free(sId);
+    }
 }
 
-void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout)
+void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout, gboolean bOSK)
 {
     if (isGreeter() == FALSE)
     {
@@ -494,9 +514,9 @@ static void onDispose(GObject *pObject)
         g_slist_free_full(self->pPrivate->lLayoutRec, g_free);
     }
 
-    if (self->pPrivate->sSystemLayout)
+    if (self->pPrivate->lSystemLayouts)
     {
-        g_free (self->pPrivate->sSystemLayout);
+        g_strfreev (self->pPrivate->lSystemLayouts);
     }
 
     G_OBJECT_CLASS(keyboard_parent_class)->dispose(pObject);
@@ -553,9 +573,20 @@ static void onUserChanged (GDBusConnection *pConnection, const gchar *sSender, c
     }
 }
 
+gboolean keyboard_hasHardwareKeyboard (Keyboard *self)
+{
+    return TRUE;
+}
+
+gboolean keyboard_hasSoftwareKeyboard (Keyboard *self)
+{
+    return FALSE;
+}
+
 static void keyboard_init(Keyboard *self)
 {
     self->pPrivate = keyboard_get_instance_private(self);
+    self->pPrivate->lLayoutRec = NULL;
     self->pPrivate->lLayouts = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, freeLayout);
 
     // Read all available layouts
@@ -645,145 +676,26 @@ static void keyboard_init(Keyboard *self)
         self->pPrivate->lUsers = NULL;
         self->pPrivate->nSubscription = g_dbus_connection_signal_subscribe (self->pPrivate->pConnection, NULL, GREETER_BUS_NAME, "UserChanged", GREETER_BUS_PATH, NULL, G_DBUS_SIGNAL_FLAGS_NONE, onUserChanged, self, NULL);
 
-        // Get system layout
-        gboolean bDefaultLocation = g_file_test ("/etc/default/keyboard", G_FILE_TEST_EXISTS);
-        gchar *sLocation = NULL;
-
-        if (bDefaultLocation)
-        {
-            sLocation = "/etc/default/keyboard";
-        }
-        else
-        {
-            sLocation = "/etc/X11/xorg.conf.d/00-keyboard.conf";
-        }
-
-        gchar *sFile = NULL;
-        GError *pError = NULL;
-        g_file_get_contents (sLocation, &sFile, NULL, &pError);
-        gchar *sLayout = NULL;
-        gchar *sVariant = NULL;
-
-        if (!pError)
-        {
-            GRegex *pRegex = NULL;
-
-            if (bDefaultLocation)
-            {
-                #if GLIB_CHECK_VERSION(2, 73, 0)
-                    pRegex = g_regex_new (" *XKBLAYOUT *= *\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
-                #else
-                    pRegex = g_regex_new (" *XKBLAYOUT *= *\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
-                #endif
-            }
-            else
-            {
-                #if GLIB_CHECK_VERSION(2, 73, 0)
-                    pRegex = g_regex_new (" *Option +\"*XkbLayout\"* +\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
-                #else
-                    pRegex = g_regex_new (" *Option +\"*XkbLayout\"* +\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
-                #endif
-            }
-
-            if (!pError)
-            {
-                GMatchInfo *pMatchInfo = NULL;
-
-                #if GLIB_CHECK_VERSION(2, 73, 0)
-                    gboolean bMatch = g_regex_match (pRegex, sFile, G_REGEX_MATCH_DEFAULT, &pMatchInfo);
-                #else
-                    gboolean bMatch = g_regex_match (pRegex, sFile, (GRegexMatchFlags) 0, &pMatchInfo);
-                #endif
+        // Get system layouts
+        getSystemLayouts ("/etc/default/keyboard", &self->pPrivate->lLayoutRec, &self->pPrivate->lSystemLayouts, TRUE);
 
-                if (bMatch)
-                {
-                    sLayout = g_match_info_fetch (pMatchInfo, 1);
-                }
-                else
-                {
-                    g_error ("PANIC: No system XkbLayout found");
-                }
-
-                g_match_info_free (pMatchInfo);
-                g_regex_unref (pRegex);
-            }
-            else
-            {
-                g_error ("PANIC: Failed to compile regex: %s", pError->message);
-                g_error_free (pError);
-            }
-
-            if (bDefaultLocation)
-            {
-                #if GLIB_CHECK_VERSION(2, 73, 0)
-                    pRegex = g_regex_new (" *XKBVARIANT *= *\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
-                #else
-                    pRegex = g_regex_new (" *XKBVARIANT *= *\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
-                #endif
-            }
-            else
-            {
-                #if GLIB_CHECK_VERSION(2, 73, 0)
-                    pRegex = g_regex_new (" *Option +\"*XkbVariant\"* +\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
-                #else
-                    pRegex = g_regex_new (" *Option +\"*XkbVariant\"* +\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
-                #endif
-            }
-
-            if (!pError)
-            {
-                GMatchInfo *pMatchInfo = NULL;
-
-                #if GLIB_CHECK_VERSION(2, 73, 0)
-                    gboolean bMatch = g_regex_match (pRegex, sFile, G_REGEX_MATCH_DEFAULT, &pMatchInfo);
-                #else
-                    gboolean bMatch = g_regex_match (pRegex, sFile, (GRegexMatchFlags) 0, &pMatchInfo);
-                #endif
-
-                if (bMatch)
-                {
-                    sVariant = g_match_info_fetch (pMatchInfo, 1);
-                }
-
-                g_match_info_free (pMatchInfo);
-                g_regex_unref (pRegex);
-            }
-            else
-            {
-                g_error ("PANIC: Failed to compile regex: %s", pError->message);
-                g_error_free (pError);
-            }
-
-            g_free(sFile);
-        }
-        else
+        if (!self->pPrivate->lLayoutRec)
         {
-            g_error ("PANIC: Failed to get %s contents: %s", sLocation, pError->message);
-            g_error_free (pError);
+            getSystemLayouts ("/etc/X11/xorg.conf.d/00-keyboard.conf", &self->pPrivate->lLayoutRec, &self->pPrivate->lSystemLayouts, TRUE);
         }
 
-        gchar *sId = NULL;
-        guint nVariant = 0;
-
-        if (sVariant)
-        {
-            nVariant = strlen (sVariant);
-        }
-
-        if (nVariant)
-        {
-            sId = g_strconcat (sLayout, "+", sVariant, NULL);
-        }
-        else
+        if (!self->pPrivate->lLayoutRec)
         {
-            sId = g_strdup (sLayout);
+            GStrvBuilder *pBuilder = g_strv_builder_new ();
+            gchar *sId = g_strdup ("us");
+            self->pPrivate->lLayoutRec = g_slist_append (self->pPrivate->lLayoutRec, sId);
+            g_strv_builder_add (pBuilder, sId);
+            self->pPrivate->lSystemLayouts = g_strv_builder_end (pBuilder);
+            g_strv_builder_unref (pBuilder);
         }
 
-        g_free (sLayout);
-        g_free (sVariant);
-        self->pPrivate->lLayoutRec = g_slist_append (self->pPrivate->lLayoutRec, sId);
-        self->pPrivate->sSystemLayout = g_strdup (sId);
         self->pPrivate->nLayout = 0;
+        //~ Get system layouts
 
         ActUserManager *pManager = act_user_manager_get_default();
         gboolean bIsLoaded;
diff --git a/src/keyboard.h b/src/keyboard.h
index 39f822cd..206c4bf3 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Robert Tari <robert@tari.in>
+ * Copyright 2021-2025 Robert Tari <robert@tari.in>
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -46,10 +46,12 @@ struct _KeyboardClass
 GType keyboard_get_type(void);
 Keyboard* keyboard_new();
 void keyboard_AddSource(Keyboard *pKeyboard);
-guint keyboard_GetNumLayouts(Keyboard *pKeyboard);
-guint keyboard_GetLayoutIndex (Keyboard *pKeyboard);
-void keyboard_GetLayout(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gchar **pDescription);
-void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout);
+guint keyboard_GetNumLayouts(Keyboard *pKeyboard, gboolean bOSK);
+guint keyboard_GetLayoutIndex (Keyboard *pKeyboard, gboolean bOSK);
+void keyboard_GetLayout(Keyboard *pKeyboard, gboolean bOSK, gint nLayout, gchar **pLanguage, gchar **pDescription, gchar **pId);
+void keyboard_SetLayout(Keyboard *pKeyboard, gint nLayout, gboolean bOSK);
+gboolean keyboard_hasHardwareKeyboard(Keyboard *pKeyboard);
+gboolean keyboard_hasSoftwareKeyboard(Keyboard *pKeyboard);
 
 G_END_DECLS
 
diff --git a/src/service.c b/src/service.c
index 6d083569..123308c9 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 Robert Tari <robert@tari.in>
+ * Copyright 2021-2025 Robert Tari <robert@tari.in>
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 3, as published
@@ -25,14 +25,19 @@
 
 #define ICON_DEFAULT "input-keyboard"
 
+#define HWKBD FALSE
+#define OSK   TRUE
+
 static guint m_nSignal = 0;
 static void *m_pLibHandle = NULL;
 static Keyboard* (*m_fnKeyboardNew)();
 static void (*m_fnKeyboardAddSource)(Keyboard *pKeyboard);
-static guint (*m_fnKeyboardGetNumLayouts)(Keyboard *pKeyboard);
+static guint (*m_fnKeyboardGetNumLayouts)(Keyboard *pKeyboard, gboolean bOSK);
 static guint (*m_fnKeyboardGetLayoutIndex)(Keyboard *pKeyboard);
-static void (*m_fnKeyboardGetLayout)(Keyboard *pKeyboard, gint nLayout, gchar **pLanguage, gchar **pDescription);
-static void (*m_fnKeyboardSetLayout)(Keyboard *pKeyboard, gint nLayout);
+static void (*m_fnKeyboardGetLayout)(Keyboard *pKeyboard, gboolean bOSK, gint nLayout, gchar **pLanguage, gchar **pDescription, gchar **pId);
+static void (*m_fnKeyboardSetLayout)(Keyboard *pKeyboard, gint nLayout, gboolean bOSK);
+static gboolean (*m_fnKeyboardHasHardwareKeyboard)(Keyboard *pKeyboard);
+static gboolean (*m_fnKeyboardHasSoftwareKeyboard)(Keyboard *pKeyboard);
 
 enum
 {
@@ -77,9 +82,12 @@ struct _IndicatorKeyboardServicePrivate
     GSimpleAction *pSettingsAction;
     GSimpleAction *pDisplayAction;
     GSimpleAction *pLayoutAction;
+    GSimpleAction *pOSKLayoutAction;
     GMenu *pLayoutSection;
     Keyboard *pKeyboard;
     GSettings *pSettings;
+    GSettings *pLomiriSettings;
+    gboolean bLomiri;
 };
 
 typedef IndicatorKeyboardServicePrivate priv_t;
@@ -118,8 +126,9 @@ static GVariant* createHeaderState(IndicatorKeyboardService *self, int nProfile)
     }
     else
     {
+        gboolean bHardwareKeyboard = m_fnKeyboardHasHardwareKeyboard (self->pPrivate->pKeyboard);
         gchar *sLanguage;
-        m_fnKeyboardGetLayout(self->pPrivate->pKeyboard, -1, &sLanguage, NULL);
+        m_fnKeyboardGetLayout(self->pPrivate->pKeyboard, self->pPrivate->bLomiri && !bHardwareKeyboard, -1, &sLanguage, NULL, NULL);
 
         gchar *sIcon = g_strconcat("ayatana-indicator-keyboard-", sLanguage, NULL);
         g_free(sLanguage);
@@ -146,20 +155,67 @@ static GVariant* createHeaderState(IndicatorKeyboardService *self, int nProfile)
     return g_variant_builder_end(&cBuilder);
 }
 
-static GMenuModel* createLayoutSection(IndicatorKeyboardService *self)
+static GMenuModel* createLayoutSection(IndicatorKeyboardService *self, gboolean bOSK)
 {
     self->pPrivate->pLayoutSection = g_menu_new();
+    gboolean bCreate = TRUE;
 
-    guint nLayouts = m_fnKeyboardGetNumLayouts(self->pPrivate->pKeyboard);
+    if (self->pPrivate->bLomiri)
+    {
+        if (!bOSK)
+        {
+            gboolean bHardwareKeyboard = m_fnKeyboardHasHardwareKeyboard (self->pPrivate->pKeyboard);
+
+            if (bHardwareKeyboard)
+            {
+                g_menu_append (self->pPrivate->pLayoutSection, _("External Keyboard"), NULL);
+            }
+            else
+            {
+                bCreate = FALSE;
+            }
+        }
+        else if (bOSK)
+        {
+            gboolean bSoftwareKeyboard = m_fnKeyboardHasSoftwareKeyboard (self->pPrivate->pKeyboard);
+            g_menu_append (self->pPrivate->pLayoutSection, _("On-Screen Keyboard"), NULL);
+
+            if (!bSoftwareKeyboard)
+            {
+                bCreate = FALSE;
+            }
+        }
+    }
+    else if (bOSK)
+    {
+        bCreate = FALSE;
+    }
+    if (!bCreate)
+    {
+        return G_MENU_MODEL(self->pPrivate->pLayoutSection);
+    }
+
+    guint nLayouts = m_fnKeyboardGetNumLayouts(self->pPrivate->pKeyboard, bOSK);
 
     for (guint nLayout = 0; nLayout < nLayouts; nLayout++)
     {
         gchar *sLanguage;
         gchar *sDescription;
-        m_fnKeyboardGetLayout(self->pPrivate->pKeyboard, nLayout, &sLanguage, &sDescription);
+        m_fnKeyboardGetLayout(self->pPrivate->pKeyboard, bOSK, nLayout, &sLanguage, &sDescription, NULL);
         GMenuItem *pItem = g_menu_item_new(sDescription, NULL);
         g_free(sDescription);
-        g_menu_item_set_action_and_target_value(pItem, "indicator.layout", g_variant_new_byte(nLayout));
+        gchar *sAction = NULL;
+
+        if (bOSK)
+        {
+            sAction = "indicator.osklayout";
+        }
+        else
+        {
+            sAction = "indicator.layout";
+        }
+
+        g_menu_item_set_action_and_target_value(pItem, sAction, g_variant_new_byte(nLayout));
         g_menu_item_set_attribute_value(pItem, "x-ayatana-layout", g_variant_new_byte(nLayout));
         gchar *sIcon = g_strconcat("ayatana-indicator-keyboard-", sLanguage, NULL);
         g_free(sLanguage);
@@ -182,10 +238,46 @@ static GMenuModel* createLayoutSection(IndicatorKeyboardService *self)
     return G_MENU_MODEL(self->pPrivate->pLayoutSection);
 }
 
-static GMenuModel* createSettingsSection(IndicatorKeyboardService *self)
+static GMenuModel* createSettingsSection(IndicatorKeyboardService *self, gboolean bOSK)
 {
     GMenu * pMenu = g_menu_new();
-    g_menu_append(pMenu, _("Keyboard Settingsā€¦"), "indicator.settings");
+    gboolean bUbuntuTouch = ayatana_common_utils_is_ubuntutouch ();
+
+    if (self->pPrivate->bLomiri && bOSK && !bUbuntuTouch)
+    {
+        GMenuItem *pItem = g_menu_item_new (_("Always show OSK"), "indicator.osk(true)");
+        g_menu_item_set_attribute (pItem, "x-ayatana-type", "s", "org.ayatana.indicator.switch");
+        g_menu_append_item (pMenu, pItem);
+        g_object_unref (pItem);
+    }
+
+    gchar *sAction = NULL;
+
+    if (self->pPrivate->bLomiri)
+    {
+        if (!bOSK)
+        {
+            gboolean bHardwareKeyboard = m_fnKeyboardHasHardwareKeyboard (self->pPrivate->pKeyboard);
+
+            if (bHardwareKeyboard)
+            {
+                sAction = "indicator.settings";
+            }
+        }
+        else if (bOSK)
+        {
+            sAction = "indicator.osksettings";
+        }
+    }
+    else if (!bOSK)
+    {
+        sAction = "indicator.settings";
+    }
+
+    if (sAction)
+    {
+        g_menu_append(pMenu, _("Keyboard Settingsā€¦"), sAction);
+    }
 
     return G_MENU_MODEL(pMenu);
 }
@@ -193,7 +285,22 @@ static GMenuModel* createSettingsSection(IndicatorKeyboardService *self)
 static GMenuModel* createDisplaySection (IndicatorKeyboardService *self)
 {
     GMenu * pMenu = g_menu_new ();
-    g_menu_append (pMenu, _("Show Current Layout"), "indicator.display");
+    gboolean bDisplay = TRUE;
+
+    if (self->pPrivate->bLomiri)
+    {
+        gboolean bHardwareKeyboard = m_fnKeyboardHasHardwareKeyboard (self->pPrivate->pKeyboard);
+
+        if (!bHardwareKeyboard)
+        {
+            bDisplay = FALSE;
+        }
+    }
+
+    if (bDisplay)
+    {
+        g_menu_append (pMenu, _("Show Current Layout"), "indicator.display");
+    }
 
     return G_MENU_MODEL (pMenu);
 }
@@ -225,9 +332,12 @@ static void rebuildNow(IndicatorKeyboardService *self, guint nSections)
 
     if (nSections & SECTION_LAYOUTS)
     {
-        rebuildSection(pInfoDesktop->pSubmenu, 0, createLayoutSection(self));
-        rebuildSection(pInfoPhone->pSubmenu, 0, createLayoutSection(self));
-        rebuildSection(pInfoGreeter->pSubmenu, 0, createLayoutSection(self));
+        rebuildSection(pInfoDesktop->pSubmenu, 0, createLayoutSection(self, HWKBD));
+        rebuildSection(pInfoDesktop->pSubmenu, 3, createLayoutSection(self, OSK));
+        rebuildSection(pInfoPhone->pSubmenu, 0, createLayoutSection(self, HWKBD));
+        rebuildSection(pInfoPhone->pSubmenu, 2, createLayoutSection(self, OSK));
+        rebuildSection(pInfoGreeter->pSubmenu, 0, createLayoutSection(self, HWKBD));
+        rebuildSection(pInfoGreeter->pSubmenu, 1, createLayoutSection(self, OSK));
     }
 
     if (nSections & SECTION_DISPLAY)
@@ -237,8 +347,10 @@ static void rebuildNow(IndicatorKeyboardService *self, guint nSections)
 
     if (nSections & SECTION_SETTINGS)
     {
-        rebuildSection(pInfoDesktop->pSubmenu, 2, createSettingsSection(self));
-        rebuildSection(pInfoPhone->pSubmenu, 2, createSettingsSection(self));
+        rebuildSection(pInfoDesktop->pSubmenu, 2, createSettingsSection(self, HWKBD));
+        rebuildSection(pInfoDesktop->pSubmenu, 4, createSettingsSection(self, OSK));
+        rebuildSection(pInfoPhone->pSubmenu, 1, createSettingsSection(self, HWKBD));
+        rebuildSection(pInfoPhone->pSubmenu, 3, createSettingsSection(self, OSK));
     }
 }
 
@@ -256,18 +368,23 @@ static void createMenu(IndicatorKeyboardService *self, int nProfile)
     // Build the sections
     if (nProfile == PROFILE_PHONE)
     {
-        lSections[nSection++] = createLayoutSection(self);
-        lSections[nSection++] = createSettingsSection(self);
+        lSections[nSection++] = createLayoutSection(self, HWKBD);
+        lSections[nSection++] = createSettingsSection(self, HWKBD);
+        lSections[nSection++] = createLayoutSection(self, OSK);
+        lSections[nSection++] = createSettingsSection(self, OSK);
     }
     else if (nProfile == PROFILE_DESKTOP)
     {
-        lSections[nSection++] = createLayoutSection(self);
+        lSections[nSection++] = createLayoutSection(self, HWKBD);
         lSections[nSection++] = createDisplaySection(self);
-        lSections[nSection++] = createSettingsSection(self);
+        lSections[nSection++] = createSettingsSection(self, HWKBD);
+        lSections[nSection++] = createLayoutSection(self, OSK);
+        lSections[nSection++] = createSettingsSection(self, OSK);
     }
     else if (nProfile == PROFILE_GREETER)
     {
-        lSections[nSection++] = createLayoutSection(self);
+        lSections[nSection++] = createLayoutSection(self, HWKBD);
+        lSections[nSection++] = createLayoutSection(self, OSK);
     }
 
     // Add sections to the submenu
@@ -312,41 +429,79 @@ static void onLayoutSelected(GSimpleAction *pAction, GVariant *pVariant, gpointe
 {
     IndicatorKeyboardService *self = INDICATOR_KEYBOARD_SERVICE(pData);
     const guint8 nLayout = g_variant_get_byte(pVariant);
-    m_fnKeyboardSetLayout(self->pPrivate->pKeyboard, nLayout);
+    m_fnKeyboardSetLayout(self->pPrivate->pKeyboard, nLayout, HWKBD);
 }
 
-static void onSettings(GSimpleAction *pAction, GVariant *pVariant, gpointer pUserData)
+static void onOSKLayoutSelected (GSimpleAction *pAction, GVariant *pVariant, gpointer pData)
 {
+    IndicatorKeyboardService *self = INDICATOR_KEYBOARD_SERVICE (pData);
+    const guint8 nLayout = g_variant_get_byte (pVariant);
+    m_fnKeyboardSetLayout (self->pPrivate->pKeyboard, nLayout, OSK);
+}
+
+static void onSettings(GSimpleAction *pAction, GVariant *pVariant, gpointer pData)
+{
+    IndicatorKeyboardService *self = INDICATOR_KEYBOARD_SERVICE (pData);
+
     if (ayatana_common_utils_is_mate())
     {
         ayatana_common_utils_execute_command("mate-keyboard-properties");
     }
-    else if (ayatana_common_utils_is_lomiri())
+    else if (self->pPrivate->bLomiri)
     {
         ayatana_common_utils_open_url("settings:///system/hw-keyboard-layouts");
     }
 }
 
+static void onOSKSettings(GSimpleAction *pAction, GVariant *pVariant, gpointer pData)
+{
+    ayatana_common_utils_open_url ("settings:///system/sw-keyboard-layouts");
+}
+
 static void onDisplay (GSimpleAction *pAction, GVariant *pVariant, gpointer pData)
 {
     IndicatorKeyboardService *self = INDICATOR_KEYBOARD_SERVICE (pData);
     guint nLayout = m_fnKeyboardGetLayoutIndex (self->pPrivate->pKeyboard);
     gchar *sProgram = NULL;
+    gchar *sArgs = NULL;
+    gboolean bMate = ayatana_common_utils_is_mate ();
+    gboolean bLomiri = ayatana_common_utils_is_lomiri ();
 
-    if (ayatana_common_utils_is_mate ())
+    if (bMate)
     {
         sProgram = "matekbd-keyboard-display";
+        sArgs = g_strdup_printf ("-g %i", nLayout + 1);
+    }
+    else if (bLomiri)
+    {
+
+        sProgram = "tecla";
+        m_fnKeyboardGetLayout (self->pPrivate->pKeyboard, HWKBD, -1, NULL, NULL, &sArgs);
     }
     else
     {
         sProgram = "gkbd-keyboard-display";
+        sArgs = g_strdup_printf ("-g %i", nLayout + 1);
     }
 
-    gchar *sArgs = g_strdup_printf ("-g %i", nLayout + 1);
     ayatana_common_utils_execute_command_warn (sProgram, sArgs);
     g_free (sArgs);
 }
 
+static gboolean valueFromVariant (GValue *pValue, GVariant *pVariant, gpointer pUserData)
+{
+    g_value_set_variant (pValue, pVariant);
+
+    return TRUE;
+}
+
+static GVariant* valueToVariant (const GValue *pValue, const GVariantType *pType, gpointer pUserData)
+{
+    GVariant *pVariant = g_value_dup_variant (pValue);
+
+    return pVariant;
+}
+
 static void initActions(IndicatorKeyboardService *self)
 {
     GSimpleAction *pAction;
@@ -366,11 +521,37 @@ static void initActions(IndicatorKeyboardService *self)
     self->pPrivate->pLayoutAction = pAction;
     g_signal_connect(pAction, "activate", G_CALLBACK(onLayoutSelected), self);
 
+    if (self->pPrivate->bLomiri)
+    {
+        pAction = g_simple_action_new("osklayout", G_VARIANT_TYPE_BYTE);
+        g_action_map_add_action(G_ACTION_MAP(self->pPrivate->pActionGroup), G_ACTION(pAction));
+        self->pPrivate->pOSKLayoutAction = pAction;
+        g_signal_connect(pAction, "activate", G_CALLBACK(onOSKLayoutSelected), self);
+    }
+
+    if (self->pPrivate->bLomiri && (!ayatana_common_utils_is_ubuntutouch()))
+    {
+        gboolean bOsk = g_settings_get_boolean (self->pPrivate->pLomiriSettings, "always-show-osk");
+        GVariant *pOsk = g_variant_new_boolean (bOsk);
+        pAction = g_simple_action_new_stateful ("osk", G_VARIANT_TYPE_BOOLEAN, pOsk);
+        g_settings_bind_with_mapping (self->pPrivate->pLomiriSettings, "always-show-osk", pAction, "state", G_SETTINGS_BIND_DEFAULT, valueFromVariant, valueToVariant, NULL, NULL);
+        g_action_map_add_action (G_ACTION_MAP (self->pPrivate->pActionGroup), G_ACTION (pAction));
+        g_object_unref (G_OBJECT (pAction));
+    }
+
     pAction = g_simple_action_new("settings", NULL);
     g_action_map_add_action(G_ACTION_MAP(self->pPrivate->pActionGroup), G_ACTION(pAction));
     self->pPrivate->pSettingsAction = pAction;
     g_signal_connect(pAction, "activate", G_CALLBACK(onSettings), self);
 
+    if (self->pPrivate->bLomiri)
+    {
+        pAction = g_simple_action_new ("osksettings", NULL);
+        g_action_map_add_action(G_ACTION_MAP (self->pPrivate->pActionGroup), G_ACTION (pAction));
+        self->pPrivate->pSettingsAction = pAction;
+        g_signal_connect (pAction, "activate", G_CALLBACK (onOSKSettings), self);
+    }
+
     pAction = g_simple_action_new ("display", NULL);
     g_action_map_add_action (G_ACTION_MAP (self->pPrivate->pActionGroup), G_ACTION (pAction));
     self->pPrivate->pDisplayAction = pAction;
@@ -462,6 +643,8 @@ static void onDispose(GObject *pObject)
         g_clear_object (&self->pPrivate->pSettings);
     }
 
+    g_clear_object (&self->pPrivate->pLomiriSettings);
+
     if (self->pPrivate->pKeyboard != NULL)
     {
         g_object_unref(G_OBJECT(self->pPrivate->pKeyboard));
@@ -485,6 +668,7 @@ static void onDispose(GObject *pObject)
     g_clear_object (&self->pPrivate->pSettingsAction);
     g_clear_object (&self->pPrivate->pDisplayAction);
     g_clear_object (&self->pPrivate->pLayoutAction);
+    g_clear_object (&self->pPrivate->pOSKLayoutAction);
 
     for (int nProfile = 0; nProfile < N_PROFILES; ++nProfile)
     {
@@ -512,8 +696,9 @@ static void onSettingsChanged(GSettings *pSettings, gchar *sKey, gpointer pData)
 static void indicator_keyboard_service_init(IndicatorKeyboardService *self)
 {
     gchar *sLib = "libayatana-keyboard-x11.so.0";
+    gboolean bLomiri = ayatana_common_utils_is_lomiri ();
 
-    if (ayatana_common_utils_is_lomiri())
+    if (bLomiri)
     {
         sLib = "libayatana-keyboard-lomiri.so.0";
     }
@@ -539,10 +724,19 @@ static void indicator_keyboard_service_init(IndicatorKeyboardService *self)
     m_fnKeyboardGetLayoutIndex = dlsym(m_pLibHandle, "keyboard_GetLayoutIndex");
     m_fnKeyboardGetLayout = dlsym(m_pLibHandle, "keyboard_GetLayout");
     m_fnKeyboardSetLayout = dlsym(m_pLibHandle, "keyboard_SetLayout");
+    m_fnKeyboardHasHardwareKeyboard = dlsym(m_pLibHandle, "keyboard_hasHardwareKeyboard");
+    m_fnKeyboardHasSoftwareKeyboard = dlsym(m_pLibHandle, "keyboard_hasSoftwareKeyboard");
     self->pPrivate = indicator_keyboard_service_get_instance_private(self);
+    self->pPrivate->bLomiri = bLomiri;
     self->pPrivate->pCancellable = g_cancellable_new();
     self->pPrivate->pSettings = g_settings_new ("org.ayatana.indicator.keyboard");
     g_signal_connect(self->pPrivate->pSettings, "changed", G_CALLBACK(onSettingsChanged), self);
+
+    if (self->pPrivate->bLomiri)
+    {
+        self->pPrivate->pLomiriSettings = g_settings_new ("com.lomiri.Shell");
+    }
+
     self->pPrivate->pKeyboard = m_fnKeyboardNew();
     g_signal_connect(self->pPrivate->pKeyboard, KEYBOARD_LAYOUT_CHANGED, G_CALLBACK(onLayoutChanged), self);
     g_signal_connect(self->pPrivate->pKeyboard, KEYBOARD_CONFIG_CHANGED, G_CALLBACK(onConfigChanged), self);
diff --git a/src/system-layouts.h b/src/system-layouts.h
new file mode 100644
index 00000000..af9b2b5c
--- /dev/null
+++ b/src/system-layouts.h
@@ -0,0 +1,186 @@
+/*
+ * Copyright 2024 Robert Tari <robert@tari.in>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __SYSTEM_LAYOUTS__
+#define __SYSTEM_LAYOUTS__
+
+G_BEGIN_DECLS
+
+static void getSystemLayouts (gchar *sLocation, GSList **lLayoutRec, GStrv *lSystemLayouts, gboolean bSystemLayouts)
+{
+    gboolean bExists = g_file_test (sLocation, G_FILE_TEST_EXISTS);
+
+    if (!bExists)
+    {
+        return;
+    }
+
+    gchar *sFile = NULL;
+    GError *pError = NULL;
+    g_file_get_contents (sLocation, &sFile, NULL, &pError);
+
+    if (pError)
+    {
+        g_error_free (pError);
+
+        return;
+    }
+
+    GRegex *pRegex = NULL;
+    gboolean bDefaultLocation = g_str_equal (sLocation, "/etc/default/keyboard");
+
+    if (bDefaultLocation)
+    {
+        #if GLIB_CHECK_VERSION(2, 73, 0)
+            pRegex = g_regex_new (" *XKBLAYOUT *= *\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
+        #else
+            pRegex = g_regex_new (" *XKBLAYOUT *= *\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
+        #endif
+    }
+    else
+    {
+        #if GLIB_CHECK_VERSION(2, 73, 0)
+            pRegex = g_regex_new (" *Option +\"*XkbLayout\"* +\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
+        #else
+            pRegex = g_regex_new (" *Option +\"*XkbLayout\"* +\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
+        #endif
+    }
+
+    if (pError)
+    {
+        g_warning ("Panic: Failed to compile regex: %s", pError->message);
+        g_error_free (pError);
+        g_free(sFile);
+
+        return;
+    }
+
+    GMatchInfo *pMatchInfo = NULL;
+
+    #if GLIB_CHECK_VERSION(2, 73, 0)
+        gboolean bMatch = g_regex_match (pRegex, sFile, G_REGEX_MATCH_DEFAULT, &pMatchInfo);
+    #else
+        gboolean bMatch = g_regex_match (pRegex, sFile, (GRegexMatchFlags) 0, &pMatchInfo);
+    #endif
+
+    if (!bMatch)
+    {
+        g_regex_unref (pRegex);
+        g_free(sFile);
+
+        return;
+    }
+
+    gchar *sLayouts = g_match_info_fetch (pMatchInfo, 1);
+    GStrv lLayouts = g_strsplit (sLayouts, ",", -1);
+    g_free (sLayouts);
+    g_match_info_free (pMatchInfo);
+    g_regex_unref (pRegex);
+
+    if (bDefaultLocation)
+    {
+        #if GLIB_CHECK_VERSION(2, 73, 0)
+            pRegex = g_regex_new (" *XKBVARIANT *= *\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
+        #else
+            pRegex = g_regex_new (" *XKBVARIANT *= *\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
+        #endif
+    }
+    else
+    {
+        #if GLIB_CHECK_VERSION(2, 73, 0)
+            pRegex = g_regex_new (" *Option +\"*XkbVariant\"* +\"*([,a-zA-Z0-9]*)\"*", G_REGEX_DEFAULT, G_REGEX_MATCH_DEFAULT, &pError);
+        #else
+            pRegex = g_regex_new (" *Option +\"*XkbVariant\"* +\"*([,a-zA-Z0-9]*)\"*", (GRegexCompileFlags) 0, (GRegexMatchFlags) 0, &pError);
+        #endif
+    }
+
+    if (pError)
+    {
+        g_warning ("Panic: Failed to compile regex: %s", pError->message);
+        g_error_free (pError);
+        g_free(sFile);
+
+        return;
+    }
+
+    #if GLIB_CHECK_VERSION(2, 73, 0)
+        bMatch = g_regex_match (pRegex, sFile, G_REGEX_MATCH_DEFAULT, &pMatchInfo);
+    #else
+        bMatch = g_regex_match (pRegex, sFile, (GRegexMatchFlags) 0, &pMatchInfo);
+    #endif
+
+    if (!bMatch)
+    {
+        g_regex_unref (pRegex);
+        g_free(sFile);
+
+        return;
+    }
+
+    gchar *sVariants = g_match_info_fetch (pMatchInfo, 1);
+    GStrv lVariants = g_strsplit (sVariants, ",", -1);
+    g_free (sVariants);
+    g_match_info_free (pMatchInfo);
+    g_regex_unref (pRegex);
+    g_free(sFile);
+    guint nLayouts = g_strv_length (lLayouts);
+    GStrvBuilder *pBuilder = NULL;
+
+    if (bSystemLayouts)
+    {
+        pBuilder = g_strv_builder_new ();
+    }
+
+    for (guint nLayout = 0; nLayout < nLayouts; nLayout++)
+    {
+        gchar *sId = NULL;
+        guint nVariantLength = 0;
+
+        if (lVariants && lVariants[nLayout])
+        {
+            nVariantLength = strlen (lVariants[nLayout]);
+        }
+
+        if (nVariantLength)
+        {
+            sId = g_strconcat (lLayouts[nLayout], "+", lVariants[nLayout], NULL);
+        }
+        else
+        {
+            sId = g_strdup (lLayouts[nLayout]);
+        }
+
+        *lLayoutRec = g_slist_append (*lLayoutRec, sId);
+
+        if (bSystemLayouts)
+        {
+            g_strv_builder_add (pBuilder, sId);
+        }
+    }
+
+    if (bSystemLayouts)
+    {
+        *lSystemLayouts = g_strv_builder_end (pBuilder);
+        g_strv_builder_unref (pBuilder);
+    }
+
+    g_strfreev (lLayouts);
+    g_strfreev (lVariants);
+}
+
+G_END_DECLS
+
+#endif