Update translation template.

4 files changed, 338 insertions, 299 deletions

diff --git a/template/messages/tdebase/kcmkeys.pot b/template/messages/tdebase/kcmkeys.pot
index c326408c14a..a628d6ff1d7 100644
--- a/template/messages/tdebase/kcmkeys.pot
+++ b/template/messages/tdebase/kcmkeys.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-07-07 18:16+0000\n"
+"POT-Creation-Date: 2023-03-24 18:16+0000\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"
@@ -89,41 +89,41 @@ msgstr ""
 msgid "Application Missing"
 msgstr ""
 
-#: keyconfig.cpp:118
+#: keyconfig.cpp:117
 msgid "&Key Scheme"
 msgstr ""
 
-#: keyconfig.cpp:120
+#: keyconfig.cpp:119
 msgid ""
 "Here you can see a list of the existing key binding schemes with 'Current "
 "scheme' referring to the settings you are using right now. Select a scheme "
 "to use, remove or change it."
 msgstr ""
 
-#: keyconfig.cpp:126
+#: keyconfig.cpp:125
 msgid "&Save Scheme..."
 msgstr ""
 
-#: keyconfig.cpp:128 shortcuts.cpp:170
+#: keyconfig.cpp:127 shortcuts.cpp:169
 msgid ""
 "Click here to add a new key bindings scheme. You will be prompted for a name."
 msgstr ""
 
-#: keyconfig.cpp:130
+#: keyconfig.cpp:129
 msgid "&Remove Scheme"
 msgstr ""
 
-#: keyconfig.cpp:133
+#: keyconfig.cpp:132
 msgid ""
 "Click here to remove the selected key bindings scheme. You can not remove "
 "the standard system wide schemes, 'Current scheme' and 'TDE default'."
 msgstr ""
 
-#: keyconfig.cpp:142
+#: keyconfig.cpp:141
 msgid "Prefer 4-modifier defaults"
 msgstr ""
 
-#: keyconfig.cpp:147
+#: keyconfig.cpp:146
 msgid ""
 "If your keyboard has a Meta key, but you would like TDE to prefer the 3-"
 "modifier configuration defaults, then this option should be unchecked."
@@ -166,7 +166,7 @@ msgstr ""
 msgid "X11-Mod"
 msgstr ""
 
-#: modifiers.cpp:195 modifiers.cpp:291 shortcuts.cpp:338
+#: modifiers.cpp:195 modifiers.cpp:291 shortcuts.cpp:337
 msgid "Win"
 msgstr ""
 
@@ -232,71 +232,71 @@ msgid ""
 "copy and paste."
 msgstr ""
 
-#: shortcuts.cpp:157
+#: shortcuts.cpp:156
 msgid ""
 "Click here to remove the selected key bindings scheme. You cannot remove the "
 "standard system-wide schemes 'Current scheme' and 'TDE default'."
 msgstr ""
 
-#: shortcuts.cpp:163
+#: shortcuts.cpp:162
 msgid "New scheme"
 msgstr ""
 
-#: shortcuts.cpp:168
+#: shortcuts.cpp:167
 msgid "&Save..."
 msgstr ""
 
-#: shortcuts.cpp:195
+#: shortcuts.cpp:194
 msgid "Use Win key as modifier (uncheck to bind Win key to Menu)"
 msgstr ""
 
-#: shortcuts.cpp:201
+#: shortcuts.cpp:200
 msgid "&Global Shortcuts"
 msgstr ""
 
-#: shortcuts.cpp:206
+#: shortcuts.cpp:205
 msgid "Shortcut Se&quences"
 msgstr ""
 
-#: shortcuts.cpp:211
+#: shortcuts.cpp:210
 msgid "App&lication Shortcuts"
 msgstr ""
 
-#: shortcuts.cpp:272
+#: shortcuts.cpp:271
 msgid "User-Defined Scheme"
 msgstr ""
 
-#: shortcuts.cpp:273
+#: shortcuts.cpp:272
 msgid "Current Scheme"
 msgstr ""
 
-#: shortcuts.cpp:316
+#: shortcuts.cpp:315
 msgid ""
 "Your current changes will be lost if you load another scheme before saving "
 "this one."
 msgstr ""
 
-#: shortcuts.cpp:336
+#: shortcuts.cpp:335
 msgid ""
 "This scheme requires the \"%1\" modifier key, which is not available on your "
 "keyboard layout. Do you wish to view it anyway?"
 msgstr ""
 
-#: shortcuts.cpp:365 shortcuts.cpp:398
+#: shortcuts.cpp:364 shortcuts.cpp:397
 msgid "Save Key Scheme"
 msgstr ""
 
-#: shortcuts.cpp:366
+#: shortcuts.cpp:365
 msgid "Enter a name for the key scheme:"
 msgstr ""
 
-#: shortcuts.cpp:396
+#: shortcuts.cpp:395
 msgid ""
 "A key scheme with the name '%1' already exists;\n"
 "do you want to overwrite it?\n"
 msgstr ""
 
-#: shortcuts.cpp:399
+#: shortcuts.cpp:398
 msgid "Overwrite"
 msgstr ""
 
@@ -851,11 +851,3 @@ msgstr ""
 #: ../../klipper/klipperbindings.cpp:32
 msgid "Enable/Disable Clipboard Actions"
 msgstr ""
-
-#: ../../kxkb/kxkbbindings.cpp:9
-msgid "Keyboard"
-msgstr ""
-
-#: ../../kxkb/kxkbbindings.cpp:10
-msgid "Switch to Next Keyboard Layout"
-msgstr ""
diff --git a/template/messages/tdebase/kcmlayout.pot b/template/messages/tdebase/kcmlayout.pot
index 9cce1569157..cc446546692 100644
--- a/template/messages/tdebase/kcmlayout.pot
+++ b/template/messages/tdebase/kcmlayout.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2022-03-19 18:16+0000\n"
+"POT-Creation-Date: 2023-03-24 18:16+0000\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"
@@ -27,546 +27,569 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: kcmlayout.cpp:652
+#: kcmlayout.cpp:237 kcmlayout.cpp:668 kcmlayout.cpp:676
 msgid "None"
 msgstr ""
 
-#: kcmlayout.cpp:921
+#: kcmlayout.cpp:238
+msgid "Other..."
+msgstr ""
+
+#: kcmlayout.cpp:820 kcmlayout.cpp:950 kcmlayout.cpp:1054
+msgid "grp"
+msgstr ""
+
+#: kcmlayout.cpp:930
+msgid ""
+"<qt>The option <b>%1</b> might conflict with other options that you have "
+"already enabled.<br>Are you sure that you really want to enable <b>%2</b>?</"
+"qt>"
+msgstr ""
+
+#: kcmlayout.cpp:936
+msgid "Conflicting options"
+msgstr ""
+
+#: kcmlayout.cpp:1012
+msgid "Custom..."
+msgstr ""
+
+#: kcmlayout.cpp:1022
+msgid "Other (%1)"
+msgstr ""
+
+#: kcmlayout.cpp:1028
+msgid "Multiple (%1)"
+msgstr ""
+
+#: kcmlayout.cpp:1233
 msgid "Brazilian ABNT2"
 msgstr ""
 
-#: kcmlayout.cpp:922
+#: kcmlayout.cpp:1234
 msgid "Dell 101-key PC"
 msgstr ""
 
-#: kcmlayout.cpp:923
+#: kcmlayout.cpp:1235
 msgid "Everex STEPnote"
 msgstr ""
 
-#: kcmlayout.cpp:924
+#: kcmlayout.cpp:1236
 msgid "Generic 101-key PC"
 msgstr ""
 
-#: kcmlayout.cpp:925
+#: kcmlayout.cpp:1237
 msgid "Generic 102-key (Intl) PC"
 msgstr ""
 
-#: kcmlayout.cpp:926
+#: kcmlayout.cpp:1238
 msgid "Generic 104-key PC"
 msgstr ""
 
-#: kcmlayout.cpp:927
+#: kcmlayout.cpp:1239
 msgid "Generic 105-key (Intl) PC"
 msgstr ""
 
-#: kcmlayout.cpp:928
+#: kcmlayout.cpp:1240
 msgid "Japanese 106-key"
 msgstr ""
 
-#: kcmlayout.cpp:929
+#: kcmlayout.cpp:1241
 msgid "Microsoft Natural"
 msgstr ""
 
-#: kcmlayout.cpp:930
+#: kcmlayout.cpp:1242
 msgid "Northgate OmniKey 101"
 msgstr ""
 
-#: kcmlayout.cpp:931
+#: kcmlayout.cpp:1243
 msgid "Keytronic FlexPro"
 msgstr ""
 
-#: kcmlayout.cpp:932
+#: kcmlayout.cpp:1244
 msgid "Winbook Model XP5"
 msgstr ""
 
-#: kcmlayout.cpp:935
+#: kcmlayout.cpp:1247
 msgid "Group Shift/Lock behavior"
 msgstr ""
 
-#: kcmlayout.cpp:936
+#: kcmlayout.cpp:1248
 msgid "R-Alt switches group while pressed"
 msgstr ""
 
-#: kcmlayout.cpp:937
+#: kcmlayout.cpp:1249
 msgid "Right Alt key changes group"
 msgstr ""
 
-#: kcmlayout.cpp:938
+#: kcmlayout.cpp:1250
 msgid "Caps Lock key changes group"
 msgstr ""
 
-#: kcmlayout.cpp:939
+#: kcmlayout.cpp:1251
 msgid "Menu key changes group"
 msgstr ""
 
-#: kcmlayout.cpp:940
+#: kcmlayout.cpp:1252
 msgid "Both Shift keys together change group"
 msgstr ""
 
-#: kcmlayout.cpp:941
+#: kcmlayout.cpp:1253
 msgid "Control+Shift changes group"
 msgstr ""
 
-#: kcmlayout.cpp:942
+#: kcmlayout.cpp:1254
 msgid "Alt+Control changes group"
 msgstr ""
 
-#: kcmlayout.cpp:943
+#: kcmlayout.cpp:1255
 msgid "Alt+Shift changes group"
 msgstr ""
 
-#: kcmlayout.cpp:944
+#: kcmlayout.cpp:1256
 msgid "Control Key Position"
 msgstr ""
 
-#: kcmlayout.cpp:945
+#: kcmlayout.cpp:1257
 msgid "Make CapsLock an additional Control"
 msgstr ""
 
-#: kcmlayout.cpp:946
+#: kcmlayout.cpp:1258
 msgid "Swap Control and Caps Lock"
 msgstr ""
 
-#: kcmlayout.cpp:947
+#: kcmlayout.cpp:1259
 msgid "Control key at left of 'A'"
 msgstr ""
 
-#: kcmlayout.cpp:948
+#: kcmlayout.cpp:1260
 msgid "Control key at bottom left"
 msgstr ""
 
-#: kcmlayout.cpp:949
+#: kcmlayout.cpp:1261
 msgid "Use keyboard LED to show alternative group"
 msgstr ""
 
-#: kcmlayout.cpp:950
+#: kcmlayout.cpp:1262
 msgid "Num_Lock LED shows alternative group"
 msgstr ""
 
-#: kcmlayout.cpp:951
+#: kcmlayout.cpp:1263
 msgid "Caps_Lock LED shows alternative group"
 msgstr ""
 
-#: kcmlayout.cpp:952
+#: kcmlayout.cpp:1264
 msgid "Scroll_Lock LED shows alternative group"
 msgstr ""
 
-#: kcmlayout.cpp:955
+#: kcmlayout.cpp:1267
 msgid "Left Win-key switches group while pressed"
 msgstr ""
 
-#: kcmlayout.cpp:956
+#: kcmlayout.cpp:1268
 msgid "Right Win-key switches group while pressed"
 msgstr ""
 
-#: kcmlayout.cpp:957
+#: kcmlayout.cpp:1269
 msgid "Both Win-keys switch group while pressed"
 msgstr ""
 
-#: kcmlayout.cpp:958
+#: kcmlayout.cpp:1270
 msgid "Left Win-key changes group"
 msgstr ""
 
-#: kcmlayout.cpp:959
+#: kcmlayout.cpp:1271
 msgid "Right Win-key changes group"
 msgstr ""
 
-#: kcmlayout.cpp:960
+#: kcmlayout.cpp:1272
 msgid "Third level choosers"
 msgstr ""
 
-#: kcmlayout.cpp:961
+#: kcmlayout.cpp:1273
 msgid "Press Right Control to choose 3rd level"
 msgstr ""
 
-#: kcmlayout.cpp:962
+#: kcmlayout.cpp:1274
 msgid "Press Menu key to choose 3rd level"
 msgstr ""
 
-#: kcmlayout.cpp:963
+#: kcmlayout.cpp:1275
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr ""
 
-#: kcmlayout.cpp:964
+#: kcmlayout.cpp:1276
 msgid "Press Left Win-key to choose 3rd level"
 msgstr ""
 
-#: kcmlayout.cpp:965
+#: kcmlayout.cpp:1277
 msgid "Press Right Win-key to choose 3rd level"
 msgstr ""
 
-#: kcmlayout.cpp:966
+#: kcmlayout.cpp:1278
 msgid "CapsLock key behavior"
 msgstr ""
 
-#: kcmlayout.cpp:967
+#: kcmlayout.cpp:1279
 msgid "uses internal capitalization. Shift cancels Caps."
 msgstr ""
 
-#: kcmlayout.cpp:968
+#: kcmlayout.cpp:1280
 msgid "uses internal capitalization. Shift doesn't cancel Caps."
 msgstr ""
 
-#: kcmlayout.cpp:969
+#: kcmlayout.cpp:1281
 msgid "acts as Shift with locking. Shift cancels Caps."
 msgstr ""
 
-#: kcmlayout.cpp:970
+#: kcmlayout.cpp:1282
 msgid "acts as Shift with locking. Shift doesn't cancel Caps."
 msgstr ""
 
-#: kcmlayout.cpp:971
+#: kcmlayout.cpp:1283
 msgid "Alt/Win key behavior"
 msgstr ""
 
-#: kcmlayout.cpp:972
+#: kcmlayout.cpp:1284
 msgid "Add the standard behavior to Menu key."
 msgstr ""
 
-#: kcmlayout.cpp:973
+#: kcmlayout.cpp:1285
 msgid "Alt and Meta on the Alt keys (default)."
 msgstr ""
 
-#: kcmlayout.cpp:974
+#: kcmlayout.cpp:1286
 msgid "Meta is mapped to the Win-keys."
 msgstr ""
 
-#: kcmlayout.cpp:975
+#: kcmlayout.cpp:1287
 msgid "Meta is mapped to the left Win-key."
 msgstr ""
 
-#: kcmlayout.cpp:976
+#: kcmlayout.cpp:1288
 msgid "Super is mapped to the Win-keys (default)."
 msgstr ""
 
-#: kcmlayout.cpp:977
+#: kcmlayout.cpp:1289
 msgid "Hyper is mapped to the Win-keys."
 msgstr ""
 
-#: kcmlayout.cpp:978
+#: kcmlayout.cpp:1290
 msgid "Right Alt is Compose"
 msgstr ""
 
-#: kcmlayout.cpp:979
+#: kcmlayout.cpp:1291
 msgid "Right Win-key is Compose"
 msgstr ""
 
-#: kcmlayout.cpp:980
+#: kcmlayout.cpp:1292
 msgid "Menu is Compose"
 msgstr ""
 
-#: kcmlayout.cpp:983
+#: kcmlayout.cpp:1295
 msgid "Both Ctrl keys together change group"
 msgstr ""
 
-#: kcmlayout.cpp:984
+#: kcmlayout.cpp:1296
 msgid "Both Alt keys together change group"
 msgstr ""
 
-#: kcmlayout.cpp:985
+#: kcmlayout.cpp:1297
 msgid "Left Shift key changes group"
 msgstr ""
 
-#: kcmlayout.cpp:986
+#: kcmlayout.cpp:1298
 msgid "Right Shift key changes group"
 msgstr ""
 
-#: kcmlayout.cpp:987
+#: kcmlayout.cpp:1299
 msgid "Right Ctrl key changes group"
 msgstr ""
 
-#: kcmlayout.cpp:988
+#: kcmlayout.cpp:1300
 msgid "Left Alt key changes group"
 msgstr ""
 
-#: kcmlayout.cpp:989
+#: kcmlayout.cpp:1301
 msgid "Left Ctrl key changes group"
 msgstr ""
 
-#: kcmlayout.cpp:990
+#: kcmlayout.cpp:1302
 msgid "Compose Key"
 msgstr ""
 
-#: kcmlayout.cpp:993
+#: kcmlayout.cpp:1305
 msgid "Shift with numpad keys works as in MS Windows."
 msgstr ""
 
-#: kcmlayout.cpp:994
+#: kcmlayout.cpp:1306
 msgid "Special keys (Ctrl+Alt+<key>) handled in a server."
 msgstr ""
 
-#: kcmlayout.cpp:995
+#: kcmlayout.cpp:1307
 msgid "Miscellaneous compatibility options"
 msgstr ""
 
-#: kcmlayout.cpp:996
+#: kcmlayout.cpp:1308
 msgid "Right Control key works as Right Alt"
 msgstr ""
 
-#: kcmlayout.cpp:999
+#: kcmlayout.cpp:1311
 msgid "Right Alt key switches group while pressed"
 msgstr ""
 
-#: kcmlayout.cpp:1000
+#: kcmlayout.cpp:1312
 msgid "Left Alt key switches group while pressed"
 msgstr ""
 
-#: kcmlayout.cpp:1001
+#: kcmlayout.cpp:1313
 msgid "Press Right Alt-key to choose 3rd level"
 msgstr ""
 
-#: kcmlayout.cpp:1004
+#: kcmlayout.cpp:1316
 msgid "R-Alt switches group while pressed."
 msgstr ""
 
-#: kcmlayout.cpp:1005
+#: kcmlayout.cpp:1317
 msgid "Left Alt key switches group while pressed."
 msgstr ""
 
-#: kcmlayout.cpp:1006
+#: kcmlayout.cpp:1318
 msgid "Left Win-key switches group while pressed."
 msgstr ""
 
-#: kcmlayout.cpp:1007
+#: kcmlayout.cpp:1319
 msgid "Right Win-key switches group while pressed."
 msgstr ""
 
-#: kcmlayout.cpp:1008
+#: kcmlayout.cpp:1320
 msgid "Both Win-keys switch group while pressed."
 msgstr ""
 
-#: kcmlayout.cpp:1009
+#: kcmlayout.cpp:1321
 msgid "Right Ctrl key switches group while pressed."
 msgstr ""
 
-#: kcmlayout.cpp:1010
+#: kcmlayout.cpp:1322
 msgid "Right Alt key changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1011
+#: kcmlayout.cpp:1323
 msgid "Left Alt key changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1012
+#: kcmlayout.cpp:1324
 msgid "CapsLock key changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1013
+#: kcmlayout.cpp:1325
 msgid "Shift+CapsLock changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1014
+#: kcmlayout.cpp:1326
 msgid "Both Shift keys together change group."
 msgstr ""
 
-#: kcmlayout.cpp:1015
+#: kcmlayout.cpp:1327
 msgid "Both Alt keys together change group."
 msgstr ""
 
-#: kcmlayout.cpp:1016
+#: kcmlayout.cpp:1328
 msgid "Both Ctrl keys together change group."
 msgstr ""
 
-#: kcmlayout.cpp:1017
+#: kcmlayout.cpp:1329
 msgid "Ctrl+Shift changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1018
+#: kcmlayout.cpp:1330
 msgid "Alt+Ctrl changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1019
+#: kcmlayout.cpp:1331
 msgid "Alt+Shift changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1020
+#: kcmlayout.cpp:1332
 msgid "Menu key changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1021
+#: kcmlayout.cpp:1333
 msgid "Left Win-key changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1022
+#: kcmlayout.cpp:1334
 msgid "Right Win-key changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1023
+#: kcmlayout.cpp:1335
 msgid "Left Shift key changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1024
+#: kcmlayout.cpp:1336
 msgid "Right Shift key changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1025
+#: kcmlayout.cpp:1337
 msgid "Left Ctrl key changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1026
+#: kcmlayout.cpp:1338
 msgid "Right Ctrl key changes group."
 msgstr ""
 
-#: kcmlayout.cpp:1027
+#: kcmlayout.cpp:1339
 msgid "Press Right Ctrl to choose 3rd level."
 msgstr ""
 
-#: kcmlayout.cpp:1028
+#: kcmlayout.cpp:1340
 msgid "Press Menu key to choose 3rd level."
 msgstr ""
 
-#: kcmlayout.cpp:1029
+#: kcmlayout.cpp:1341
 msgid "Press any of Win-keys to choose 3rd level."
 msgstr ""
 
-#: kcmlayout.cpp:1030
+#: kcmlayout.cpp:1342
 msgid "Press Left Win-key to choose 3rd level."
 msgstr ""
 
-#: kcmlayout.cpp:1031
+#: kcmlayout.cpp:1343
 msgid "Press Right Win-key to choose 3rd level."
 msgstr ""
 
-#: kcmlayout.cpp:1032
+#: kcmlayout.cpp:1344
 msgid "Press any of Alt keys to choose 3rd level."
 msgstr ""
 
-#: kcmlayout.cpp:1033
+#: kcmlayout.cpp:1345
 msgid "Press Left Alt key to choose 3rd level."
 msgstr ""
 
-#: kcmlayout.cpp:1034
+#: kcmlayout.cpp:1346
 msgid "Press Right Alt key to choose 3rd level."
 msgstr ""
 
-#: kcmlayout.cpp:1035
+#: kcmlayout.cpp:1347
 msgid "Ctrl key position"
 msgstr ""
 
-#: kcmlayout.cpp:1036
+#: kcmlayout.cpp:1348
 msgid "Make CapsLock an additional Ctrl."
 msgstr ""
 
-#: kcmlayout.cpp:1037
+#: kcmlayout.cpp:1349
 msgid "Swap Ctrl and CapsLock."
 msgstr ""
 
-#: kcmlayout.cpp:1038
+#: kcmlayout.cpp:1350
 msgid "Ctrl key at left of 'A'"
 msgstr ""
 
-#: kcmlayout.cpp:1039
+#: kcmlayout.cpp:1351
 msgid "Ctrl key at bottom left"
 msgstr ""
 
-#: kcmlayout.cpp:1040
+#: kcmlayout.cpp:1352
 msgid "Right Ctrl key works as Right Alt."
 msgstr ""
 
-#: kcmlayout.cpp:1041
+#: kcmlayout.cpp:1353
 msgid "Use keyboard LED to show alternative group."
 msgstr ""
 
-#: kcmlayout.cpp:1042
+#: kcmlayout.cpp:1354
 msgid "NumLock LED shows alternative group."
 msgstr ""
 
-#: kcmlayout.cpp:1043
+#: kcmlayout.cpp:1355
 msgid "CapsLock LED shows alternative group."
 msgstr ""
 
-#: kcmlayout.cpp:1044
+#: kcmlayout.cpp:1356
 msgid "ScrollLock LED shows alternative group."
 msgstr ""
 
-#: kcmlayout.cpp:1045
+#: kcmlayout.cpp:1357
 msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
 msgstr ""
 
-#: kcmlayout.cpp:1046
+#: kcmlayout.cpp:1358
 msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
 msgstr ""
 
-#: kcmlayout.cpp:1047
+#: kcmlayout.cpp:1359
 msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
 msgstr ""
 
-#: kcmlayout.cpp:1048
+#: kcmlayout.cpp:1360
 msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
 msgstr ""
 
-#: kcmlayout.cpp:1049
+#: kcmlayout.cpp:1361
 msgid "CapsLock just locks the Shift modifier."
 msgstr ""
 
-#: kcmlayout.cpp:1050
+#: kcmlayout.cpp:1362
 msgid "CapsLock toggles normal capitalization of alphabetic characters."
 msgstr ""
 
-#: kcmlayout.cpp:1051
+#: kcmlayout.cpp:1363
 msgid "CapsLock toggles Shift so all keys are affected."
 msgstr ""
 
-#: kcmlayout.cpp:1052
+#: kcmlayout.cpp:1364
 msgid "Alt and Meta are on the Alt keys (default)."
 msgstr ""
 
-#: kcmlayout.cpp:1053
+#: kcmlayout.cpp:1365
 msgid "Alt is mapped to the right Win-key and Super to Menu."
 msgstr ""
 
-#: kcmlayout.cpp:1054
+#: kcmlayout.cpp:1366
 msgid "Compose key position"
 msgstr ""
 
-#: kcmlayout.cpp:1055
+#: kcmlayout.cpp:1367
 msgid "Right Alt is Compose."
 msgstr ""
 
-#: kcmlayout.cpp:1056
+#: kcmlayout.cpp:1368
 msgid "Right Win-key is Compose."
 msgstr ""
 
-#: kcmlayout.cpp:1057
+#: kcmlayout.cpp:1369
 msgid "Menu is Compose."
 msgstr ""
 
-#: kcmlayout.cpp:1058
+#: kcmlayout.cpp:1370
 msgid "Right Ctrl is Compose."
 msgstr ""
 
-#: kcmlayout.cpp:1059
+#: kcmlayout.cpp:1371
 msgid "Caps Lock is Compose."
 msgstr ""
 
-#: kcmlayout.cpp:1060
+#: kcmlayout.cpp:1372
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr ""
 
-#: kcmlayout.cpp:1061
+#: kcmlayout.cpp:1373
 msgid "Adding the EuroSign to certain keys"
 msgstr ""
 
-#: kcmlayout.cpp:1062
+#: kcmlayout.cpp:1374
 msgid "Add the EuroSign to the E key."
 msgstr ""
 
-#: kcmlayout.cpp:1063
+#: kcmlayout.cpp:1375
 msgid "Add the EuroSign to the 5 key."
 msgstr ""
 
-#: kcmlayout.cpp:1064
+#: kcmlayout.cpp:1376
 msgid "Add the EuroSign to the 2 key."
 msgstr ""
 
-#: kxkbbindings.cpp:9
-msgid "Keyboard"
-msgstr ""
-
-#: kxkbbindings.cpp:10
-msgid "Switch to Next Keyboard Layout"
-msgstr ""
-
 #: pixmap.cpp:325
 msgid "Belgian"
 msgstr ""
@@ -971,7 +994,7 @@ msgstr ""
 msgid "Swiss"
 msgstr ""
 
-#: kcmlayoutwidget.ui:48 kcmlayoutwidget.ui:137 kcmlayoutwidget.ui:283
+#: kcmlayoutwidget.ui:48 kcmlayoutwidget.ui:164 kcmlayoutwidget.ui:299
 #, no-c-format
 msgid "Layout"
 msgstr ""
@@ -1002,12 +1025,28 @@ msgstr ""
 
 #: kcmlayoutwidget.ui:100
 #, no-c-format
-msgid "Keyboard &model:"
+msgid "Key combination to &switch layout:"
 msgstr ""
 
 #: kcmlayoutwidget.ui:119
 #, no-c-format
 msgid ""
+"Here you can choose the key combination you want to use to switch to the "
+"next layout. This list includes only the most common variants. If you choose "
+"\"Other...\", then you will be redirected to the \"Options\" tab where you "
+"can pick from all the available variants. Note that if you have selected "
+"Append Mode in the Xkb Options tab this option is not available; you have to "
+"use the Xkb Options tab instead."
+msgstr ""
+
+#: kcmlayoutwidget.ui:127
+#, no-c-format
+msgid "Keyboard &model:"
+msgstr ""
+
+#: kcmlayoutwidget.ui:146
+#, no-c-format
+msgid ""
 "Here you can choose a keyboard model. This setting is independent of your "
 "keyboard layout and refers to the \"hardware\" model, i.e. the way your "
 "keyboard is manufactured. Modern keyboards that come with your computer "
@@ -1016,32 +1055,27 @@ msgid ""
 "have.\n"
 msgstr ""
 
-#: kcmlayoutwidget.ui:126
+#: kcmlayoutwidget.ui:153
 #, no-c-format
 msgid "1"
 msgstr ""
 
-#: kcmlayoutwidget.ui:148 kcmlayoutwidget.ui:294
+#: kcmlayoutwidget.ui:175 kcmlayoutwidget.ui:310
 #, no-c-format
 msgid "Keymap"
 msgstr ""
 
-#: kcmlayoutwidget.ui:159
+#: kcmlayoutwidget.ui:186
 #, no-c-format
 msgid "Variant"
 msgstr ""
 
-#: kcmlayoutwidget.ui:170
-#, no-c-format
-msgid "5"
-msgstr ""
-
-#: kcmlayoutwidget.ui:181
+#: kcmlayoutwidget.ui:197
 #, no-c-format
 msgid "Label"
 msgstr ""
 
-#: kcmlayoutwidget.ui:197
+#: kcmlayoutwidget.ui:213
 #, no-c-format
 msgid ""
 "If more than one layout is present in this list, the TDE panel will offer a "
@@ -1049,29 +1083,29 @@ msgid ""
 "The first layout will be default one."
 msgstr ""
 
-#: kcmlayoutwidget.ui:213
+#: kcmlayoutwidget.ui:229
 #, no-c-format
 msgid "Add >>"
 msgstr ""
 
-#: kcmlayoutwidget.ui:221
+#: kcmlayoutwidget.ui:237
 #, no-c-format
 msgid "<< Remove"
 msgstr ""
 
-#: kcmlayoutwidget.ui:263 kcmlayoutwidget.ui:873
+#: kcmlayoutwidget.ui:279 kcmlayoutwidget.ui:1022
 #, no-c-format
 msgid "Command:"
 msgstr ""
 
-#: kcmlayoutwidget.ui:316
+#: kcmlayoutwidget.ui:332
 #, no-c-format
 msgid ""
 "This is the list of available keyboard layouts in your system. You can add "
 "layout to the active list by selecting it and pressing \"Add\" button."
 msgstr ""
 
-#: kcmlayoutwidget.ui:327
+#: kcmlayoutwidget.ui:343
 #, no-c-format
 msgid ""
 "This is the command which is executed when switching to the selected layout. "
@@ -1079,29 +1113,17 @@ msgid ""
 "switch layouts without the help of TDE."
 msgstr ""
 
-#: kcmlayoutwidget.ui:338
-#, no-c-format
-msgid "Include latin layout"
-msgstr ""
-
-#: kcmlayoutwidget.ui:341
-#, no-c-format
-msgid ""
-"If after you switch to this layout some keyboard shortcuts based on latin "
-"keys do not work try to enable this option."
-msgstr ""
-
-#: kcmlayoutwidget.ui:349
+#: kcmlayoutwidget.ui:351
 #, no-c-format
 msgid "Label:"
 msgstr ""
 
-#: kcmlayoutwidget.ui:371
+#: kcmlayoutwidget.ui:373
 #, no-c-format
 msgid "Layout variant:"
 msgstr ""
 
-#: kcmlayoutwidget.ui:382
+#: kcmlayoutwidget.ui:384
 #, no-c-format
 msgid ""
 "Here you can choose a variant of selected keyboard layout. Layout variants "
@@ -1111,42 +1133,99 @@ msgid ""
 "on a transliterated latin one).\n"
 msgstr ""
 
-#: kcmlayoutwidget.ui:429
+#: kcmlayoutwidget.ui:431
 #, no-c-format
 msgid "Switching Options"
 msgstr ""
 
-#: kcmlayoutwidget.ui:474
+#: kcmlayoutwidget.ui:453
+#, no-c-format
+msgid "Switching Policy"
+msgstr ""
+
+#: kcmlayoutwidget.ui:459
+#, no-c-format
+msgid ""
+"If you select \"Application\" or \"Window\" switching policy, changing the "
+"keyboard layout will only affect the current application or window."
+msgstr ""
+
+#: kcmlayoutwidget.ui:470
+#, no-c-format
+msgid "&Global"
+msgstr ""
+
+#: kcmlayoutwidget.ui:481
+#, no-c-format
+msgid "Application"
+msgstr ""
+
+#: kcmlayoutwidget.ui:489
+#, no-c-format
+msgid "&Window"
+msgstr ""
+
+#: kcmlayoutwidget.ui:499
+#, no-c-format
+msgid "Sticky Switching"
+msgstr ""
+
+#: kcmlayoutwidget.ui:510
+#, no-c-format
+msgid "Enable sticky switching"
+msgstr ""
+
+#: kcmlayoutwidget.ui:513
+#, no-c-format
+msgid ""
+"If you have more than two layouts and turn this option on, switching with "
+"the keyboard shortcut or clicking on the kxkb indicator will only cycle "
+"through the last few layouts. You can specify the number of layouts to "
+"rotate below. You can still access all layouts by right-clicking on the kxkb "
+"indicator."
+msgstr ""
+
+#: kcmlayoutwidget.ui:558
+#, no-c-format
+msgid "Number of layouts to rotate:"
+msgstr ""
+
+#: kcmlayoutwidget.ui:614
+#, no-c-format
+msgid "Indicator Options"
+msgstr ""
+
+#: kcmlayoutwidget.ui:636
 #, no-c-format
 msgid "Indicator Style"
 msgstr ""
 
-#: kcmlayoutwidget.ui:480
+#: kcmlayoutwidget.ui:642
 #, no-c-format
 msgid "Here you can choose the way your keyboard layout indicator will look."
 msgstr ""
 
-#: kcmlayoutwidget.ui:491
+#: kcmlayoutwidget.ui:653
 #, no-c-format
 msgid "&Both Flag and Label"
 msgstr ""
 
-#: kcmlayoutwidget.ui:502
+#: kcmlayoutwidget.ui:664
 #, no-c-format
 msgid "&Flag Only"
 msgstr ""
 
-#: kcmlayoutwidget.ui:510
+#: kcmlayoutwidget.ui:672
 #, no-c-format
 msgid "&Label Only"
 msgstr ""
 
-#: kcmlayoutwidget.ui:520
+#: kcmlayoutwidget.ui:682
 #, no-c-format
 msgid "Label Style"
 msgstr ""
 
-#: kcmlayoutwidget.ui:523
+#: kcmlayoutwidget.ui:685
 #, no-c-format
 msgid ""
 "Here you can choose the way the label of your keyboard layout indicator will "
@@ -1154,156 +1233,132 @@ msgid ""
 "locales where the flag is missing."
 msgstr ""
 
-#: kcmlayoutwidget.ui:531
+#: kcmlayoutwidget.ui:693
 #, no-c-format
 msgid "Use &theme colors"
 msgstr ""
 
-#: kcmlayoutwidget.ui:542
+#: kcmlayoutwidget.ui:704
 #, no-c-format
 msgid "Use c&ustom colors"
 msgstr ""
 
-#: kcmlayoutwidget.ui:581
+#: kcmlayoutwidget.ui:746
 #, no-c-format
 msgid "Background color:"
 msgstr ""
 
-#: kcmlayoutwidget.ui:584 kcmlayoutwidget.ui:592
+#: kcmlayoutwidget.ui:749 kcmlayoutwidget.ui:757
 #, no-c-format
 msgid ""
 "This color will be used as the indicator's background unless the indicator "
 "was set to display a flag."
 msgstr ""
 
-#: kcmlayoutwidget.ui:617
+#: kcmlayoutwidget.ui:807
 #, no-c-format
 msgid "Text color:"
 msgstr ""
 
-#: kcmlayoutwidget.ui:620 kcmlayoutwidget.ui:628
+#: kcmlayoutwidget.ui:810 kcmlayoutwidget.ui:818
 #, no-c-format
 msgid "This color will be used to draw the language label on the indicator."
 msgstr ""
 
-#: kcmlayoutwidget.ui:638
+#: kcmlayoutwidget.ui:868
 #, no-c-format
 msgid "Transparent background"
 msgstr ""
 
-#: kcmlayoutwidget.ui:641
+#: kcmlayoutwidget.ui:871
 #, no-c-format
 msgid ""
 "Check this to remove the indicator's background. Only applicable in \"Label "
 "only\" mode."
 msgstr ""
 
-#: kcmlayoutwidget.ui:654
+#: kcmlayoutwidget.ui:886
 #, no-c-format
 msgid "Label font:"
 msgstr ""
 
-#: kcmlayoutwidget.ui:657
+#: kcmlayoutwidget.ui:889
 #, no-c-format
 msgid ""
 "This is the font which will be used by the layout indicator to draw the "
 "label."
 msgstr ""
 
-#: kcmlayoutwidget.ui:670
+#: kcmlayoutwidget.ui:902
 #, no-c-format
 msgid "Enable shadow"
 msgstr ""
 
-#: kcmlayoutwidget.ui:673
+#: kcmlayoutwidget.ui:905
 #, no-c-format
 msgid ""
 "Draw a drop shadow behind the language label. In some cases this option can "
 "improve readability."
 msgstr ""
 
-#: kcmlayoutwidget.ui:681
+#: kcmlayoutwidget.ui:921
 #, no-c-format
 msgid "The drop shadow behind the language label will be of this color."
 msgstr ""
 
-#: kcmlayoutwidget.ui:694
-#, no-c-format
-msgid "Switching Policy"
-msgstr ""
-
-#: kcmlayoutwidget.ui:700
-#, no-c-format
-msgid ""
-"If you select \"Application\" or \"Window\" switching policy, changing the "
-"keyboard layout will only affect the current application or window."
-msgstr ""
-
-#: kcmlayoutwidget.ui:711
-#, no-c-format
-msgid "&Global"
-msgstr ""
-
-#: kcmlayoutwidget.ui:722
+#: kcmlayoutwidget.ui:966
 #, no-c-format
-msgid "Application"
+msgid "Show indicator for single layout"
 msgstr ""
 
-#: kcmlayoutwidget.ui:730
+#: kcmlayoutwidget.ui:997 kcmlayoutwidget.ui:1008
 #, no-c-format
-msgid "&Window"
+msgid "Xkb Options"
 msgstr ""
 
-#: kcmlayoutwidget.ui:740
+#: kcmlayoutwidget.ui:1011
 #, no-c-format
-msgid "Sticky Switching"
+msgid ""
+"Here you can set xkb extension options instead of, or in addition to, "
+"specifying them in the X11 configuration file."
 msgstr ""
 
-#: kcmlayoutwidget.ui:751
+#: kcmlayoutwidget.ui:1056
 #, no-c-format
-msgid "Enable sticky switching"
+msgid "Options Mode"
 msgstr ""
 
-#: kcmlayoutwidget.ui:754
+#: kcmlayoutwidget.ui:1059
 #, no-c-format
 msgid ""
-"If you have more than two layouts and turn this option on, switching with "
-"the keyboard shortcut or clicking on the kxkb indicator will only cycle "
-"through the last few layouts. You can specify the number of layouts to "
-"rotate below. You can still access all layouts by right-clicking on the kxkb "
-"indicator."
+"Here you can choose how the options you select here will be applied: in "
+"addition to, or instead of existing options."
 msgstr ""
 
-#: kcmlayoutwidget.ui:782
+#: kcmlayoutwidget.ui:1067
 #, no-c-format
-msgid "Number of layouts to rotate:"
+msgid "&Overwrite existing options (recommended)"
 msgstr ""
 
-#: kcmlayoutwidget.ui:817
+#: kcmlayoutwidget.ui:1070
 #, no-c-format
-msgid "Show indicator for single layout"
-msgstr ""
-
-#: kcmlayoutwidget.ui:829 kcmlayoutwidget.ui:851
-#, no-c-format
-msgid "Xkb Options"
+msgid ""
+"Overwrite any existing Xkb options that might have been previously set by "
+"another program or from a script (e.g. via setxkbmap). This is the "
+"recommended option."
 msgstr ""
 
-#: kcmlayoutwidget.ui:840
+#: kcmlayoutwidget.ui:1078
 #, no-c-format
-msgid "&Enable xkb options"
+msgid "&Append to existing options"
 msgstr ""
 
-#: kcmlayoutwidget.ui:854
+#: kcmlayoutwidget.ui:1081
 #, no-c-format
 msgid ""
-"Here you can set xkb extension options instead of, or in addition to, "
-"specifying them in the X11 configuration file."
-msgstr ""
-
-#: kcmlayoutwidget.ui:865
-#, no-c-format
-msgid "&Reset old options"
+"Append the selected options to any existing Xkb options that might have been "
+"previously set by another program or from a script (e.g. via setxkbmap). "
+"Only use this if you really need to."
 msgstr ""
 
 #: kcmmiscwidget.ui:33
diff --git a/template/messages/tdebase/kxkb.pot b/template/messages/tdebase/kxkb.pot
index 2e790dc925f..0d6db7ffe7f 100644
--- a/template/messages/tdebase/kxkb.pot
+++ b/template/messages/tdebase/kxkb.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2022-03-19 18:16+0000\n"
+"POT-Creation-Date: 2023-03-24 18:16+0000\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"
@@ -27,22 +27,14 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: kxkb.cpp:373
+#: kxkb.cpp:313
 msgid "A utility to switch keyboard maps"
 msgstr ""
 
-#: kxkb.cpp:377
+#: kxkb.cpp:317
 msgid "TDE Keyboard Tool"
 msgstr ""
 
-#: kxkbbindings.cpp:9
-msgid "Keyboard"
-msgstr ""
-
-#: kxkbbindings.cpp:10
-msgid "Switch to Next Keyboard Layout"
-msgstr ""
-
 #: kxkbtraywindow.cpp:60
 msgid "Error changing keyboard layout to '%1'"
 msgstr ""
diff --git a/template/messages/tdegraphics/ksnapshot.pot b/template/messages/tdegraphics/ksnapshot.pot
index c1d8fe96128..4c9e1314547 100644
--- a/template/messages/tdegraphics/ksnapshot.pot
+++ b/template/messages/tdegraphics/ksnapshot.pot
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2023-03-05 18:14+0000\n"
+"POT-Creation-Date: 2023-03-24 18:17+0000\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"
@@ -49,42 +49,42 @@ msgstr ""
 msgid "Save the snapshot to the file specified by the user."
 msgstr ""
 
-#: ksnapshot.cpp:187
+#: ksnapshot.cpp:189
 msgid "File Exists"
 msgstr ""
 
-#: ksnapshot.cpp:188
+#: ksnapshot.cpp:190
 msgid "<qt>Do you really want to overwrite <b>%1</b>?</qt>"
 msgstr ""
 
-#: ksnapshot.cpp:189
+#: ksnapshot.cpp:191
 msgid "Overwrite"
 msgstr ""
 
-#: ksnapshot.cpp:223 ksnapshot.cpp:411
+#: ksnapshot.cpp:225 ksnapshot.cpp:416
 msgid "Unable to save image"
 msgstr ""
 
-#: ksnapshot.cpp:224
+#: ksnapshot.cpp:226
 #, c-format
 msgid ""
 "KSnapshot was unable to save the image to\n"
 "%1."
 msgstr ""
 
-#: ksnapshot.cpp:307
+#: ksnapshot.cpp:310
 msgid "Print Screenshot"
 msgstr ""
 
-#: ksnapshot.cpp:410
+#: ksnapshot.cpp:415
 msgid "KSnapshot was unable to create temporary file."
 msgstr ""
 
-#: ksnapshot.cpp:427
+#: ksnapshot.cpp:432
 msgid "Cannot start %1!"
 msgstr ""
 
-#: ksnapshot.cpp:539
+#: ksnapshot.cpp:544
 msgid "The screen has been successfully grabbed."
 msgstr ""