Update translation catalog

72 files changed, 27401 insertions, 27534 deletions

diff --git a/po/af.po b/po/af.po
index e333209..8c61c59 100644
--- a/po/af.po
+++ b/po/af.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-af\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2005-04-21 17:33+0200\n"
 "Last-Translator: Dirk van der Walt <dirkvanderwalt@webmail.co.za>\n"
 "Language-Team: Afrikaans\n"
@@ -65,22 +65,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64MB of meer"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X-bediener"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Kies 'n X-bediener"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multikop-konfigurasie"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -89,12 +89,12 @@ msgstr ""
 "U stelsel onderstuen multikop-konfigurasie.\n"
 "Wat wil u doen?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Kies die geheue grootte van u videokaart"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -102,83 +102,83 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Konfigureer skyfkoppe afsonderlik"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Gebruik Xinerama-ekstensies"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Konfigureer net die \"%s\"%s kaart"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Aangepaste"
 
 #
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Konneksiekonfigurasie"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Verlaat"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafiesekaart"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Resolusie"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Toets"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opsies"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Inprop modules"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -191,32 +191,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Kies 'n monitor"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Kies 'n monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generies"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Vervaardiger"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -239,22 +239,22 @@ msgstr ""
 "monitor spesifiseer nie, dit kan die monitor beskadig. Indien u twyfel,\n"
 "kies konservatief."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horisontale verfristempo"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikale verfristempo"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Kies aksie"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -269,7 +269,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -282,83 +282,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 kleure (8 bis)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32-duisend kleure (15 bis)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65-duisend kleure (16 bis)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16-miljoen kleure (24 bis)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Outomaties"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Resolusies"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Ander"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Kies die resolusie en kleurdiepte"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Videokaart: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Hulp"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Toets konfigurasie"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Wil u die konfigurasie toets?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Waarskuwing: deur hierdie grafikakaart te toets, mag u rekenaar fries"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -369,159 +369,164 @@ msgstr ""
 "%s\n"
 "Probeer om van u parameters te verander"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Verlaat in %d sekondes"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Is dit korrek?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "niks"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Sleutelbord uitleg: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Sleutelbord uitleg: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Muistipe: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HoriSink: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertVerfris: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Videokaart: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Video geheue: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Kleurdiepte: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolusie: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg-drywer: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg-konfigurasie"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Videokaart: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X met herlaai"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Ek kan u rekenaar so opstel om X outomaties te laai.\n"
 "Wil u X begin met 'n herlaai?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -543,922 +548,899 @@ msgstr ""
 "\n"
 "Verlang u hierdie funksie?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Watter norm gebruik u TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tseggies (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Duits"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spaans"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finnies"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Fraans"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "VK sleutelbord"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norweegs"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Pools"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Russies"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Sweeds"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "VSA sleutelbord"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanies"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenies (oud)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenies (tikmasjien)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenies (Foneties)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabies"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Estoniaans"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latyns)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgies"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (Inscript-uitleg)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgaars (Foneties)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgaars (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasiliaans (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnies"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Bosnies"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarussies"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Switsers (Duitse uitleg)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Switsers (Franse uitleg)"
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Arabies"
+"Czech (QWERTZ)"
+msgstr "Tseggies (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tseggies (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Duits"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Duits (geen dooie sleutels)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Deens"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (VSA)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Norweegs)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Norweegs)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (VSA)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norweegs)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Sweeds)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Sweeds)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estoniaans"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spaans"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finnies"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Grieks"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Fraans"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Fraans"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Grieks (polytonies)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Grieks (polytonies)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "VK sleutelbord"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgies (Russiese uitleg)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgies (Latynse uitleg)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grieks"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grieks (polytonies)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroaties"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hongaars"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Iers"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelies"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelies (Foneties)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranies"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Yslandies"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italiaans"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japanees 106 sleutels"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kanada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "VK sleutelbord"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Koreaanse sleutelbord"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Arabies"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latyns-Amerikaans"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laoties"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Iranies"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Lets"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malabaars"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Masedonies"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongools (cyrillic)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltese (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltees (VSA)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Nederlands"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norweegs"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Pools (QWERTY uitleg)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Pools (QWERTZ uitleg)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pools"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugees"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadees (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romanies (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romanies (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Romanies (QWERTZ)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Russies"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Russies (Foneties)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Sweeds"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Sloveens"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovaaks (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovaaks (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (noorweegs)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (sweeds/fins)"
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Thai sleutelbord"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serwies (Kirillies)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Siries"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Siries (Foneties)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII-uitleg)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (Tikmasjien-uitleg)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai sleutelbord"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai sleutelbord"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai sleutelbord"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajik sleutelbord"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Duits"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turks (moderne \"Q\" model)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turks (moderne \"Q\" model)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukranies"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "VSA sleutelbord"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "VSA internasionale sleutelbord"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "VSA internasionale sleutelbord"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbek (Kirillies)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Viëtnamees \"nommerry\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslaavs (latynse uitleg)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Regter Alt-sleutel"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Beide Shift-sleutels gelyktydig"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "'Control' en 'Shift' sleutels gelyktydig"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "'Capslock'-sleutel"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, fuzzy, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Ctrl- en Atl-sleutels tegelyk"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl- en Atl-sleutels tegelyk"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt- en Shift-sleutels gelyktydig"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\"-sleutel"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Linker \"Windows\" sleutel"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Regter \"Windows\"-sleutel"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Beide Control-sleutels gelyktydig"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Beide Alt-sleutels gelyktydig"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Linker 'Shift'-sleutel"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Regter 'Shift'-sleutel"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Linker 'Alt'-sleutel"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Linker 'Control'-sleutel"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Regter 'Control'-sleutel"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1469,12 +1451,12 @@ msgstr ""
 "die sal help om tussen verskillende sleutelbord-uitlegte te wissel.\n"
 "(bv: latyns en iets anders)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Waarskuwing"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1485,257 +1467,227 @@ msgstr ""
 "Gedurende installasie, moet u die regter 'Control'-sleutel\n"
 "gebruik om tussen die uitlegte te spring."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Muis"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standaard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Generiese PS2 wielmuis"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 knop"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Generiese 2-knop muis"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Generiese 3-knop Muis met Wielletjie-emulasie"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Wiel"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seriaal"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Generiese 3-knop muis"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan met wielletjie-emulasie"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Reeks (seriaal)"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Reeks (seriaal) met Wielletjie-emulasie"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Muis (seriaal, ou C7 tipe)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Muis (seriaal, ou C7 tipe) met wielletjie-emulasie"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse met Wiel-emulasie"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmuis"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 knoppies"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 knoppies"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3-knoppies met wielletjie-emulasie"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universele"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Enige PS/2 & USB muis"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Geen muis"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "niks"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Geen muis"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Kies is u tipe muistoestel."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "selfdoen"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emuleer derde knop?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Muispoort"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Aan watter seriaalpoort is u muis gekoppel?"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Knoppie-emulasie"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Knop-2 Emulasie"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3-Knop emulasie"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Toets asb. die muis"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Om die muis te aktiveer,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "BEWEEG DIE WIEL!"
@@ -1802,6 +1754,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Fraans"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Pools"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenies (oud)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Arabies"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Thai sleutelbord"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Muis"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Geen muis"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Knoppie-emulasie"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Knop-2 Emulasie"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3-Knop emulasie"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Turks (tradisionele \"F\" model)"
 
diff --git a/po/am.po b/po/am.po
index 09a86a1..79c283e 100644
--- a/po/am.po
+++ b/po/am.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2004-06-01 03:36+0100\n"
 "Last-Translator: Alemayehu <alemayehu@gmx.at>\n"
 "Language-Team: Amharic <am-translate@geez.org>\n"
@@ -59,34 +59,34 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB ወይም ከዚህ በላይ"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X ሰርቨር"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "የX ሰርቨር ይምረጡ"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-head ምርጫ"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -94,82 +94,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "የXinerama ቅጥያዎችን ተጠቀም"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "ካርድ ብቻ አስተካክል \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "ምርጫ"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "የግንኙነት ምርጫ"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "ውጣ"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "የንድፍ ካርድ"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "ጽናት"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "ሙከራ"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "ምርጫዎች"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "ተጨማሪ ፕሮግራሞች"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -178,32 +178,32 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "ሞኒተር ይምረጡ"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "ሰክተው ይጫወቱ"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "አጠቃላይ"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -218,22 +218,22 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr ""
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "ተግባር ይምረጡ"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -248,7 +248,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -261,83 +261,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 ቀለሞች (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 ሺ ቀለሞች (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 ሺ ቀለሞች (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 ሚሊዮን ቀለሞች (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "ራስ-ገዝ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "ሌላ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "የንድፎ ካርድ: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "እሺ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "ተወው"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "እርዳታ"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "የምርጫው ሙከራ"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "ምርጫውን መሞከር ይፈልጋሉ?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "ማስጠንቀቂያ: ይህንን የንድፍ ካርድ ሲሞክሩ፤ ኮምፒውተሮ በድንገት ሊቆም ይችላል"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -345,157 +345,162 @@ msgid ""
 "Try to change some parameters"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "በ%d ሴኮንዶች ውስጥ በመውጣት ላይ"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "ይህ ትክክለኛ ምርጫ ነው?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "ምንም"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "የመተየቢያ አቀራረብ: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "የመተየቢያ አቀራረብ: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "የመጠቆሚያው ዓይነት: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "የንድፍ ካርድ: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "የንድፍ ማስታወሻ: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "የቀለም ወሰን፦ %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "የXFree ማስተካከያ"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "የንድፎ ካርድ: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "የመነሻ ላይ ንድፈ እይታ"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -508,922 +513,899 @@ msgid ""
 "Do you have this feature?"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "ቼክኛ (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "ጀርመን"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "ድቮሬክ"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "ስፓኒሽ"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "ፊኒሽ"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "ፈረንሳይኛ"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "የUK መተየቢያ"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "ኖርዌጂያን"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "ፖሊሽ"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "ራሽኛ"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "ስዊድንኛ"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "የUS መተየቢያ"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "አልቤኒኛ"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "አርሜንኛ (አሮጌ)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "አርመናዊ (መተየቢያ መኪና)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "አርመናዊ (የድምጽ)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "ዐርቢኛ"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "ኤስቶኒአን"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "አዘርባጃንኛ (ላቲንኛ)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "ቤልጂየምኛ"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "ቤንጋሊ (Inscript ዕቅድ)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "ቤንጋሊ (Probhat ዕቅድ)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "ቡልጋሪኛ (የድምጽ)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "ቡልጋሪኛ (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "ብራዚላዊ (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "ቦስኒያን"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "ቦስኒያን"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "ቤላራሻኛ"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "ስዊዝ (የጀርመን ዕቅድ)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "ስዊዝ (የፈረንሳይ ዕቅድ)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "ዐርቢኛ"
+"Czech (QWERTZ)"
+msgstr "ቼክኛ (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "ቼክኛ (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "ጀርመን"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "ጀርመን (የሞቱ ቁልፎች የሉም)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "ዴቫናጋሪ"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "ዴኒሽ"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "ድቮሬክ (የአሜሪካ)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "ድቮሬክ (ስዊድንኛ)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "ድቮሬክ (ስዊድንኛ)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "ድቮሬክ (የአሜሪካ)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "ድቮሬክ (ስዊድንኛ)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "ድቮሬክ (ስዊድንኛ)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "ድቮሬክ (ስዊድንኛ)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "ኤስቶኒአን"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "ስፓኒሽ"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "ፊኒሽ"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "ግሪክኛ"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "ፈረንሳይኛ"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "ፈረንሳይኛ"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "ግሪክኛ (ፖሊቶኒክ)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "ግሪክኛ (ፖሊቶኒክ)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "የUK መተየቢያ"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "ጊዮርጊያን (\"ራሽኛ\" እቅድ)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "ጊዮርጊያን (\"ላቲንኛ\" እቅድ)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "ግሪክኛ"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "ግሪክኛ (ፖሊቶኒክ)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "ጉጃራቲ"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "ጉርሙክሂ"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "ክሮሽያዊ"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "ሀንጋሪኛ"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "አይሪሽ"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "ኢኑክቲቱት"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "እስራኤላዊ"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "እስራኤላዊ (Phonetic)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "ኢራኒያን"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "አይስላንድኛ"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "ጣሊያናዊ"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "ጃፓንኛ 106 ቁልፎች"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "ካናዳ"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "ኦሪያ"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "ኮሪያኛ መተየቢያ"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "ዐርቢኛ"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "ላቲን አሜሪካ"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "ሎቲን"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "ኢራኒያን"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "ላትቪያን"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "ማላያላም"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "ማከዶኒኛ"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "ምያንማር (ቡርመሰ)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "ሞንጎሊያን (ቄርሎሳዊ ጽሑፍ)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "ማልቴስ (የእንግሊዝ)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "ማልቴስ (የአሜሪካ)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "ደች"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "ኖርዌጂያን"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "ኦሪያ"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "ፖሊሽ (qwerty ዕቅድ)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "ፖሊሽ (qwertz ዕቅድ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "ፖሊሽ"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "ፖርቱጋሊኛ"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "ካናዲያን (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "ሮማኒያን (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "ሮማኒያን (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "ሮማኒያን (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "ራሽኛ"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "ራሽኛ (የድምጽ)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "ስዊድንኛ"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "ስሎቪኛ"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "ስሎቫኪያን (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "ስሎቫኪያን (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "ሳሚ (ኖርዌይኛ)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "ሳሚ (ስዊድንኛ/ፊኒሽ"
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "ታይ መተየቢያ"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "ሰርቢያን (ቄርሎሳዊ ጽሑፍ)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "ስይሪያክ"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "ስይሪያክ (phonetic)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "ቴሉጉ"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "ታሚል (ISCII-ዕቅድ)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "ታሚል (መተየቢያ-ዕቅድ)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "ታይ መተየቢያ"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "ታይ መተየቢያ"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "ታይ መተየቢያ"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "ታጂክ መተየቢያ"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "ጀርመን"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "ቱርክሽ (ዘመናዊ \"Q\" ሞዴል"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "ቱርክሽ (ዘመናዊ \"Q\" ሞዴል"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "ዩክረኒኛ"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "ኦሪያ"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "የUS መተየቢያ"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "የአሜሪካ መተየቢያ (አለም አቀፍ)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "የአሜሪካ መተየቢያ (አለም አቀፍ)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "ኡዝቤክ (ቄርሎሳዊ ጽሑፍ)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr ""
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "ዩጎዝላቪያን (ላቲንኛ)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "የቀኝ Alt ቁልፉ"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "ሁለቱንም የShift ቁልፎች በአንድ ጊዜ"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrl እና Shift ቁልፎችን በአንድ ጊዜ"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock ቁልፍ"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift እና CapsLock ቁልፎችን በአንድ ጊዜ"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl እና Alt ቁልፎችን በአንድ ጊዜ"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt እና Shift ቁልፎችን በአንድ ጊዜ"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"መዘርዝር\" ቁልፍ"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "የግራ \"መስኮት\" ቁልፉ"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "የቀኝ \"መስኮት\" ቁልፉ"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "ሁለቱንም የControl ቁልፎች በአንድ ጊዜ"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "ሁለቱንም የAlt ቁልፎች በአንድ ጊዜ"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "የግራ Shift ቁልፉ"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "የቀኝ Shift ቁልፉ"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "የግራ Alt ቁልፍ"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "የግራ Control ቁልፍ"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "የቀኝ Control ቁልፍ"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1431,12 +1413,12 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "ማስጠንቀቂያ"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1444,257 +1426,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - መጠቆሚያ"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "መደበኛ"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr ""
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr ""
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking መጠቆሚያ"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr ""
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr ""
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "የማይክሮሶፍት ቃኚ"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 ቁልፍ"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "አጠቃላይ ባለ 2 ቁልፍ መጠቆሚያ"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr ""
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr ""
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "አጠቃላይ ባለ 3 ቁልፍ መጠቆሚያ"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "የመጠቆሚያ ሲስተሞች"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "የLogitech CC ተከታታይ"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr ""
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "የMM ተከታታይ"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr ""
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr ""
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 ቁልፎች"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 ቁልፎች"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "አጠቃላይ"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "የማይክሮሶፍት ቃኚ"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "መጠቆሚያ የለም"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ምንም"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "መጠቆሚያ የለም"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "እባክዎ የመጠቆሚያዎን አይነት ይምረጡ።"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "የመመሪያ ምርጫ"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, fuzzy, c-format
 msgid "Emulate third button?"
 msgstr "'መረጃ' የሚለውን ቁልፍ አሳይ"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "የመጠቆሚያ ፖርት"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr ""
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "የቁልፎች ቅጂ"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "የቁልፉ 2 ቅጂ"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "የቁልፉ 3 ቅጂ"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "እባክዎ መጠቆሚያውን ይሞክሩ"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "መጠቆሚያውን ለማስጀመር፣"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ተሽከርካሪውን ያንቀሳቅሱ!"
@@ -1758,6 +1710,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "ድቮሬክ"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "ፈረንሳይኛ"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "ፖሊሽ"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "አርሜንኛ (አሮጌ)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "ዐርቢኛ"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "ታይ መተየቢያ"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - መጠቆሚያ"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "መጠቆሚያ የለም"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "የቁልፎች ቅጂ"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "የቁልፉ 2 ቅጂ"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "የቁልፉ 3 ቅጂ"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "ቱርክሽ (ባህላዊ \"F\" ሞዴል"
 
diff --git a/po/ar.po b/po/ar.po
index 4a22db7..37fd66e 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2011-05-19 13:11+0000\n"
 "Last-Translator: salim salim <almusalimalmusalimah@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -61,22 +61,22 @@ msgstr "32 م.ب."
 msgid "64 MB or more"
 msgstr "64 م.ب. أو أكثر"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "خادم X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "اختيار خادم X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "تهيئة متعدد الرؤوس"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -85,12 +85,12 @@ msgstr ""
 "نظامك يدعم التهيئة متعدد الرؤوس.\n"
 "ماذا تريد أن تفعل؟"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "اختيار حجم ذاكرة بطاقة الشاشة"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -101,82 +101,82 @@ msgstr ""
 "لبعض الوظائف الخاصة بها.\n"
 "هل تريد استخدامها؟"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr "التعريف المملوك غير مثبت حاليًّا ، سيتم العودة إفتراضيا للتعريف المجاني"
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "تهيئة كل الرؤوس بشكل مستقل"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "استخدام امتداد Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "تهيئة البطاقة \"%s\"%s فقط"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "مخصّص"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "إعداد بطاقة الرسوميات و الشاشة"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "خروج"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "بطاقة الشاشة"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "الشاشة"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "الاستبانة"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "اختبار"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "خيارات"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "الملحقات"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "ملف تهيئة Xorg معطوب. سنتجاهله."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -189,32 +189,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "اختيار شاشة للرّأس رقم %d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "اختيار شاشة"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "توصيل وتشغيل"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "شامل"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "المصنع"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -236,22 +236,22 @@ msgstr ""
 "أكبر من مقدرة شاشتك لأنك بهذا قد تدمر شاشتك.\n"
 " إذا لم تكن متأكدا يمكنك اختيار إعدادات عادية."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "نسبة الإنعاش الأفقي"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "نسبة الإنعاش الرأسي"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "اختر اﻹضافات/الملحقات"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -266,7 +266,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -279,83 +279,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 لون (8 بت)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 ألف لون (15 بت)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 ألف لون (16 بت)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 مليون لون (24 بت)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "آلي"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "الاستبانات"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "أخرى"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "اختيار الاستبانة وعمق الألوان"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "بطاقة الشاشة: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "موافق"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "إلغاء"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "مساعدة"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "اختبار التهيئة"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "هل تريد تجربة التهيئة؟"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "تحذير: اختبار بطاقة العرض هذه قد يتسبب في إيقاف جهازك"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -366,157 +366,162 @@ msgstr ""
 "%s\n"
 "حاول تغيير بعض المُعطيات "
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "ستتم المغادرة في %d ثوان"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "هل هذا هو الإعداد الصحيح؟"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "عطّل Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "لا"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "نعم"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "التسريع الثلاثي اﻷبعاد للعتاد: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "لوحة المفاتيح: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "لوحة المفاتيح: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "نوع الماوس: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "الشاشة: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "تزامن الشاشة الأفقي: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "إنعاش الشاشة الرأسي: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "بطاقة الشاشة: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "ذاكرة بطاقة الشاشة: %s كيلوبايت\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "عمق الألوان: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "الاستبانة: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "برنامج تشغيل Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "تهيئة Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "خيارات عمومية"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "عطّل Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "خيارات بطاقة الرسوميات"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "مكِّن شبه الشفافية"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "استخدم مؤشر الفأرة المسرّع"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "مكِّن تسريع النقاء (ربما يبب مشكلة في عرض النصوص)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "مكِّن العرض المزدوج على الشاشة الخارجية"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "مكِّن العرض المزدوج على العرض الثاني"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "أجبر وضع العرض لـ DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "مكِّن المفتاح الساخن - السريع - لـ BIOS ﻷجل التبديل للشاشة الخارجية"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "استخدم EXA عوضا عن  of XAA (أفضل أداء في النقاء و الخلط)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "واجهة رسومية عند بدء التشغيل"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "بدء تلقائي للواجهة الرسومية  (Xorg) عند اﻹقلاع "
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -536,922 +541,899 @@ msgstr ""
 "\n"
 "هل لديك هذه الميزة؟"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "أي نظام يستخدمه جهاز التلفاز لديك؟"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "أخرى"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "التشيكية (QWERTZ("
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "الألمانية"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "الأسبانية"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "الفنلنديّة"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "الفرنسيّة"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "لوحة المفاتيح البريطانية"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "النرويجية"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "البولونيّة"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "الروسيّة"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "السويديّة"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "لوحة المفاتيح الأمريكية"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "الألبانيّة"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "الأرمنية (قديم)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "الأرمنية (آلة كاتبة)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "الأرمنية (صوتي)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "العربية"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "الإستونية"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "الأذربيجانية (لاتيني)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "البلجيكية"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "البنغالية (توزيعة Inscript("
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "البنغالية (Probhat("
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "البلغارية (صوتية)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "البلغارية (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "البرازيلية (ABNT-2("
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "البوسنيّة"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "زونخا/تيبتيّة"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "البيلاروسية"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "السويسرية (توزيع ألماني)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "السويسرية (توزيع فرنسي)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "شيروكي مقطعي"
+"Czech (QWERTZ)"
+msgstr "التشيكية (QWERTZ("
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "تشيكيّة (QWERTY("
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "الألمانية"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "الألمانية (لا مفاتيح ميتة)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "ديفانغاري"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "الدانمركية"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (أمريكا("
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (إسبرانتو("
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (فرنسيّة("
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (المملكة المتّحدة("
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (نرويجيةّ("
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (بولنديّة("
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (سويدية("
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "الإستونية"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "الأسبانية"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "الفنلنديّة"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "فارويّة"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "الفرنسيّة"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "الفرنسيّة"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "يونانية (polytonic("
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "يونانية (polytonic("
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "لوحة المفاتيح البريطانية"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "الجورجية (التوزيع \"الروسي\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "الجورجيةّ (التوزيع \"اللاتيني\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "اليونانيّة"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "يونانية (polytonic("
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "غوجاراتي"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "غورموكهي"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "الكرواتيّة"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "الهنغاريّة"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "الايرلندية"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "اينوكتيتوت"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "العبريّة"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "العبرية (صوتية)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "الفارسيّة"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "الآيسلاندية"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "الإيطاليّة"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "اليابانية 106 مفاتيح"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "كنّادا"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "قيرغزيّة"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "الكوريّة"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "كرديّة (بخطٍّ عربي)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "الأمريكية اللاتينية"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "اللاوسية"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "الليتوانية"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "لاتفيّة"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "المالايالام"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "الماورية"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "المقدونية"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "ميانمار (البورمية)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "المنغولية (سيريلية)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "المالطية (بريطانيا)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "المالطية (أمريكا)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "النيجيرية"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "الهولندية"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "النرويجية"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "أوريا"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "البولندية (توزيعة qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "البولندية (توزيعة qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "باشتويّة"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "البرتغالية"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "الكنديّة (كيبيك)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "الرومانية (qwertz("
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "الرومانية (qwertz("
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "الرومانية (qwertz("
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "الروسيّة"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "الرّوسية (صوتية)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "السويديّة"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "السلوفينية"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "السنهالية"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "السلوفاكية (QWERTZ("
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "السلوفاكية (QWERTY("
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "سآمي (نرويجي)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "سآمي (سويدية/فنلندية)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "سنديّة"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "الصربية (سيريلي)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "السريانية"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "السريانية (صوتي)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "التيلوغو"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "التاميل (توزيع ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "التاميل (توزيع الآلة كاتبة)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "تايلنديّة (كدماني)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "تايلنديّة (TIS-820("
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "تايلنديّة (باتشوتي)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "تيفيناغ (تخطيط مغربي) (+لاتينية/عربية)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "تفتناغ (لفظي) (+لاتينية/عربية)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "الطاجيك"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "تركمانيّة"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "التركية (طراز \"Q\" الحديث)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "التركية (طراز \"Q\" الحديث)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "الأكرانية"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "لوحة المفاتيح الأردو"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "لوحة المفاتيح الأمريكية"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "لوحة مفاتيح أمريكية (دولي)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "لوحة مفاتيح أمريكية (دولي)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (لوحة مفاتيح US مع ثلاث مستويات لكل مفتاح)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "الأوزبكية (سيريلي)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "الفيتنامية \"صف رقمي\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "اليوغوسلافية (لاتيني)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "مفتاح Alt الأيمن"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "مفتاحيّ Shift معاً"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "مفاتيح Control و Shift معاً"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "مفتاح CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "مفاتيح Shift و CapsLock معاً"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "مفاتيح Ctrl و Alt معاً"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "مفاتيح Alt و Shift معاً"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "مفتاح \"Menu\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "مفتاح \"ويندوز\" الأيسر"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "مفتاح \"ويندوز\" الأيمن"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "مفتاحيّ Control معاً"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "مفتاحيّ Alt معاً"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "مفتاح Shift الأيسر"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "مفتاح Shift الأيمن"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "مفتاح Alt الأيسر"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "مفتاح Control الأيسر"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "مفتاح Control الأيمن"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1462,12 +1444,12 @@ msgstr ""
 "ستسمح لك بالتبديل بين لغات لوحة المفاتيح المختلفة\n"
 "(مثلاً: لاتيني و غير لاتيني)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "تحذير"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1478,257 +1460,227 @@ msgstr ""
 "خلال التّثبيت، ستحتاج إلى استخدام زرّ التحكّم الأيمن\n"
 "للتبديل بين أنماط لوحة المفاتيح المتعدّدة."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "صن - ماوس"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "قياسي"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "ماوس PS2 شاملة ذات عجل"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "ماوس Kensington Thinking"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "ميكروسوفت Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "زر واحد"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "ماوس شاملة ذات زرّين"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "ماوس شاملة ذاث 3 أزرار مع مُحاكات العجل"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "عجل"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "توالي"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "ماوس شاملة ذات 3 أزرار"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "ميكروسوفت IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan مع محاكاة العجلة"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "أنظمة الماوس"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "سلسلات Logitech CC"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "سلسلات Logitech CC مع محاكاة العجلة"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "سلسلة MM"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (serial، old C7 type)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (توالي، نوع C7 القديم)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "ماوس Kensington Thinking مع محاكاة العجلة"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "زرّين"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 أزرار"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 أزرار مع محاكاة العجلة"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "عالمي"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "أيّ ماوس PS/2 و USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "اجبر و ألزم evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "يد التحكم S لميكروسوفت إكس بوكس"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "فأرة الصندوق الوهمي - virtualbox -"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "فأرة اﻵلة الوهمية - VMware -"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "لاشئ"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "لا ماوس"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "اختبار الفأرة"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "الرجاء اختيار نوع الماوس."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "خيار الفأرة"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "محاكاة الزر الثالث؟"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "منفذ الماوس"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "الرجاء اختيار المنفذ التسلسلي الموصلة به الماوس"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "محاكاة الأزرار"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "محاكاة الزر 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "محاكاة الزر 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "من فضلك اختبر الماوس"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "لتنشيط الماوس،"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "حرك عجلة الماوس!"
@@ -1792,6 +1744,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "الفرنسيّة"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "البولونيّة"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "الأرمنية (قديم)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "شيروكي مقطعي"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "سنديّة"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "صن - ماوس"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "فأرة الصندوق الوهمي - virtualbox -"
+
+#~ msgid "VMware mouse"
+#~ msgstr "فأرة اﻵلة الوهمية - VMware -"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "محاكاة الأزرار"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "محاكاة الزر 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "محاكاة الزر 3"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "التّركية (طراز \"F\" التقليدي)"
 
diff --git a/po/ast.po b/po/ast.po
index 5736cc2..e998616 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2018-12-07 23:00+0000\n"
 "Last-Translator: enolp <enolp@softastur.org>\n"
 "Language-Team: Asturian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -63,22 +63,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB o más"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Sirvidor X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Escueyi un sirvidor X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configuración multi-monitor"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -87,12 +87,12 @@ msgstr ""
 "El to sistema sofita configuración multi-monitor.\n"
 "¿Qué quies facer?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Esbilla la cantidá de memoria de la to tarxeta gráfica"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -103,7 +103,7 @@ msgstr ""
 "sofitar carauterístiques adicionales.\n"
 "¿Deseyes usalu?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -112,43 +112,43 @@ msgstr ""
 "El controlador propietariu nun se instaló bien, camudando al controlador "
 "llibre."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configurar los monitores de mou independiente"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Usar estensión Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configurar namái la tarxeta \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personalizada"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Configuración de la tarxeta gráfica y del monitor"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Colar"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Tarxeta gráfica"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
@@ -157,32 +157,32 @@ msgstr ""
 "_: Esti ye un preséu de visualización\n"
 "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Resolución"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Probar"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opciones"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Estensiones"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "El to ficheru de configuración Xorg ta toyíu, inorarémoslu."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -195,32 +195,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Escueyi un monitor pa la tiesta #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Escueyi un monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Xenéricu"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Fabricante"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -246,22 +246,22 @@ msgstr ""
 "monitor.\n"
 "Si dubies, escueyi un axustes conservativu"
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Tasa de refrescu horizontal"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Tasa de refrescu vertical"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Escueyi los complementos"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -286,7 +286,7 @@ msgstr ""
 "controlador gráficu diendo a \"Configurar el sirvidor gráficu\" nel centru "
 "de control Mageia y vuelvi a esbillar la to tarxeta gráfica."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -308,83 +308,83 @@ msgstr ""
 "\" ya instala'l paquete del firmware manualmente o reconfigura la to tarxéta "
 "gráfica."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 colores (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil colores (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil colores (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 millones de colores (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automáticu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Resoluciones"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Otru"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Escueyi la resolución y la profundidá de colores"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Tarxeta gráfica: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Aceutar"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Encaboxar"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Prueba de la configuración"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "¿Quies probar la configuración?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Avisu: probar esta tarxeta de videu podría colingar l'ordenador"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -395,157 +395,162 @@ msgstr ""
 "%s\n"
 "Intenta camudar dellos parámetros"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Colando en %d segundos"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "¿Ye esta la configuración correuta?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Deshabilitar Ctrl-Alt-Retrocesu: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "non"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "sí"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Aceleración 3D per hardware: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Distribución del tecláu: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Distribución del tecláu: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Triba de mur: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Frecuencia horizontal del monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Refrescu vertical del monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Tarxeta gráfica: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memoria gráfica: %s KB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Profundidá de color: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolución: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Controlador Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Configuración de Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Opciones globales"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Deshabilitar Ctrl-Alt-Retrocesu"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opciones de la tarxeta gráfica"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Habilitar tresllucidez (estensión Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Usar mur apuntador aceleráu per hardware"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Habilitar aceleración RENDER (podría causar problemes amosando testu)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Habilitar pantalla duplicada nel monitor esternu"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Habilitar pantalla duplicada na segunda pantalla"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Forciar el mou de visualización de la DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Habilitar l'atayu de la BIOS pa camudar al monitor esternu"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Usar EXA en cuantes de XAA (meyor rindimientu pa Render y Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Interfaz gráfica nel aniciu"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Aniciar automáticamente la interfaz gráfica (Xorg) al arrancar."
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -566,12 +571,12 @@ msgstr ""
 "\n"
 "¿Tienes esta carauterística?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "¿Qué norma ta usando la to TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
@@ -580,107 +585,7 @@ msgstr ""
 "_:opción estraña de ratiu\n"
 "otru"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr ""
-"_: tecláu\n"
-"Checu (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr ""
-"_: tecláu\n"
-"Alemán"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr ""
-"_: tecláu\n"
-"Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr ""
-"_: tecláu\n"
-"Español"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr ""
-"_: tecláu\n"
-"Finés"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr ""
-"_: tecláu\n"
-"Francés"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Tecláu británicu"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr ""
-"_: tecláu\n"
-"Noruegu"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr ""
-"_: tecláu\n"
-"Polacu"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr ""
-"_: tecláu\n"
-"Rusu"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr ""
-"_: tecláu\n"
-"Suecu"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Tecláu estauxunidense"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -689,16 +594,7 @@ msgstr ""
 "_: tecláu\n"
 "Albanu"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr ""
-"_: tecláu\n"
-"Armeniu (vieyu)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -707,7 +603,7 @@ msgstr ""
 "_: tecláu\n"
 "Armeniu (máquina d'escribir)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -716,7 +612,7 @@ msgstr ""
 "_: tecláu\n"
 "Armeniu (fonéticu)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -725,7 +621,7 @@ msgstr ""
 "_: tecláu\n"
 "Árabe"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -734,7 +630,7 @@ msgstr ""
 "_: tecláu\n"
 "Asturianu"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -743,7 +639,7 @@ msgstr ""
 "_: tecláu\n"
 "Azerbaixanu (llatín)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -752,7 +648,7 @@ msgstr ""
 "_: tecláu\n"
 "Belga"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -761,7 +657,7 @@ msgstr ""
 "_: tecláu\n"
 "Bengalí (disposición Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -770,7 +666,7 @@ msgstr ""
 "_: tecláu\n"
 "Bengalí (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -779,7 +675,7 @@ msgstr ""
 "_: tecláu\n"
 "Búlgaru (fonéticu)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -788,7 +684,7 @@ msgstr ""
 "_: tecláu\n"
 "Búlgaru (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -797,7 +693,7 @@ msgstr ""
 "_: tecláu\n"
 "Brasileñu (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -806,7 +702,7 @@ msgstr ""
 "_: tecláu\n"
 "Bosniu"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -815,7 +711,7 @@ msgstr ""
 "_: tecláu\n"
 "Dzongkha/Tibetanu"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -824,7 +720,7 @@ msgstr ""
 "_: cecláu\n"
 "Bielorrusu"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -833,7 +729,7 @@ msgstr ""
 "_: tecláu\n"
 "Suizu (distribución alemana)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -842,16 +738,16 @@ msgstr ""
 "_: tecláu\n"
 "Suizu (distribución francesa)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
+"Czech (QWERTZ)"
 msgstr ""
 "_: tecláu\n"
-"Cherokee silábicu"
+"Checu (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -860,7 +756,16 @@ msgstr ""
 "_: tecláu\n"
 "Checu (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr ""
+"_: tecláu\n"
+"Alemán"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -869,7 +774,7 @@ msgstr ""
 "_: tecláu\n"
 "Alemán (ensin tecles muertes)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -878,7 +783,7 @@ msgstr ""
 "_: tecláu\n"
 "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -887,7 +792,7 @@ msgstr ""
 "_: tecláu\n"
 "Danés"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -896,7 +801,7 @@ msgstr ""
 "_: tecláu\n"
 "Dvorak (EE.XX)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -905,7 +810,7 @@ msgstr ""
 "_: tecláu\n"
 "Dvorak (esperantu)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -914,7 +819,7 @@ msgstr ""
 "_: tecláu\n"
 "Dvorak (francés)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -923,7 +828,7 @@ msgstr ""
 "_: tecláu\n"
 "Dvorak (Reinu xuníu)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -932,7 +837,7 @@ msgstr ""
 "_: tecláu\n"
 "Dvorak (noruegu)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -941,7 +846,7 @@ msgstr ""
 "_: tecláu\n"
 "Dvorak (polacu)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -950,7 +855,7 @@ msgstr ""
 "_: tecláu\n"
 "Dvorak (Suecu)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -959,7 +864,25 @@ msgstr ""
 "_: tecláu\n"
 "Estoniu"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr ""
+"_: tecláu\n"
+"Español"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr ""
+"_: tecláu\n"
+"Finés"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -968,21 +891,46 @@ msgstr ""
 "_: tecláu\n"
 "Faroes"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr ""
+"_: tecláu\n"
+"Francés"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr ""
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr ""
+"_: tecláu\n"
+"Griegu (politónicu)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr ""
+"_: tecláu\n"
+"Polacu (distribución qwerty)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Tecláu británicu"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -991,7 +939,7 @@ msgstr ""
 "_: tecláu\n"
 "Xeorxanu (distribución \"rusa\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1000,7 +948,7 @@ msgstr ""
 "_: tecláu\n"
 "Xeorxanu (distribución \"llatina\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1009,7 +957,7 @@ msgstr ""
 "_: tecláu\n"
 "Griegu"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1018,7 +966,7 @@ msgstr ""
 "_: tecláu\n"
 "Griegu (politónicu)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1027,7 +975,7 @@ msgstr ""
 "_: tecláu\n"
 "Guyaratí"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1036,7 +984,7 @@ msgstr ""
 "_: tecláu\n"
 "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1045,7 +993,7 @@ msgstr ""
 "_: tecláu\n"
 "Croata"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1054,7 +1002,7 @@ msgstr ""
 "_: tecláu\n"
 "Húngaru"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1063,7 +1011,7 @@ msgstr ""
 "_: tecláu\n"
 "Irlandés"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1072,7 +1020,7 @@ msgstr ""
 "_: tecláu\n"
 "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1081,7 +1029,7 @@ msgstr ""
 "_: tecláu\n"
 "Israelí"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1090,7 +1038,7 @@ msgstr ""
 "_: tecláu\n"
 "Israelí (fonéticu)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1099,7 +1047,7 @@ msgstr ""
 "_: tecláu\n"
 "Iraní"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1108,7 +1056,7 @@ msgstr ""
 "_: tecláu\n"
 "Islandés"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1117,7 +1065,7 @@ msgstr ""
 "_: tecláu\n"
 "Italianu"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1126,7 +1074,7 @@ msgstr ""
 "_: tecláu\n"
 "Xaponés de 106 tecles"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1135,7 +1083,7 @@ msgstr ""
 "_: tecláu\n"
 "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1144,7 +1092,7 @@ msgstr ""
 "_: tecláu\n"
 "Kyrgyz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1153,7 +1101,7 @@ msgstr ""
 "_: tecláu\n"
 "Coreanu"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1162,7 +1110,7 @@ msgstr ""
 "_: tecláu\n"
 "Kurdu (escritura árabe)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1171,7 +1119,7 @@ msgstr ""
 "_: tecláu\n"
 "Llatinoamericanu"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1180,7 +1128,7 @@ msgstr ""
 "_: tecláu\n"
 "Laosianu"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1189,7 +1137,7 @@ msgstr ""
 "_: tecláu\n"
 "Lituanu"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1198,7 +1146,7 @@ msgstr ""
 "_: tecláu\n"
 "Letón"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1207,7 +1155,7 @@ msgstr ""
 "_: tecláu\n"
 "Malabar"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1216,7 +1164,7 @@ msgstr ""
 "_: tecláu\n"
 "Maorí"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1225,14 +1173,14 @@ msgstr ""
 "_: tecláu\n"
 "Macedoniu"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Birmanu)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1241,7 +1189,7 @@ msgstr ""
 "_: tecláu\n"
 "Mongol (cirílicu)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1250,7 +1198,7 @@ msgstr ""
 "_: tecláu\n"
 "Maltés (Reinu Xuníu)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1259,7 +1207,7 @@ msgstr ""
 "_: tecláu\n"
 "Maltés (EE.XX)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1268,7 +1216,7 @@ msgstr ""
 "_: tecláu\n"
 "Nixerianu"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1277,7 +1225,16 @@ msgstr ""
 "_: tecláu\n"
 "Danés"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr ""
+"_: tecláu\n"
+"Noruegu"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1286,7 +1243,7 @@ msgstr ""
 "_: tecláu\n"
 "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1295,14 +1252,14 @@ msgstr ""
 "_: tecláu\n"
 "Polacu (distribución qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polacu (disposición qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1311,7 +1268,7 @@ msgstr ""
 "_: tecláu\n"
 "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1320,7 +1277,7 @@ msgstr ""
 "_: tecláu\n"
 "Portugués"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1329,7 +1286,7 @@ msgstr ""
 "_: tecláu\n"
 "Canadiense (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1338,7 +1295,7 @@ msgstr ""
 "_: tecláu\n"
 "Rumanu (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1347,14 +1304,23 @@ msgstr ""
 "_: tecláu\n"
 "Rumanu (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr ""
+"_: tecláu\n"
+"Rusu"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1363,7 +1329,16 @@ msgstr ""
 "_: tecláu\n"
 "Rusu (fonéticu)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr ""
+"_: tecláu\n"
+"Suecu"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1372,7 +1347,7 @@ msgstr ""
 "_: tecláu\n"
 "Eslovenu"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1381,7 +1356,7 @@ msgstr ""
 "_: tecláu\n"
 "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1390,7 +1365,7 @@ msgstr ""
 "_: tecláu\n"
 "Eslovacu (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1399,7 +1374,7 @@ msgstr ""
 "_: tecláu\n"
 "Eslovacu (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1408,7 +1383,7 @@ msgstr ""
 "_: tecláu\n"
 "Saami (noruegu)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1417,16 +1392,7 @@ msgstr ""
 "_: tecláu\n"
 "Saami (suecu/finés)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr ""
-"_: tecláu\n"
-"Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1435,7 +1401,7 @@ msgstr ""
 "_: tecláu\n"
 "Serbiu (cirilicu)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1444,7 +1410,7 @@ msgstr ""
 "_: tecláu\n"
 "Syriac"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1453,7 +1419,7 @@ msgstr ""
 "tecláukeyboard\n"
 "Syriac (fonéticu)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1462,7 +1428,7 @@ msgstr ""
 "_: tecláu\n"
 "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1471,7 +1437,7 @@ msgstr ""
 "_: tecláu\n"
 "Tamil (distribución ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1480,7 +1446,7 @@ msgstr ""
 "_: tecláu\n"
 "Tamil (distribución de máquina d'escribir)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1489,7 +1455,7 @@ msgstr ""
 "_: tecláu\n"
 "Tailandés (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1498,7 +1464,7 @@ msgstr ""
 "_: tecláu\n"
 "Tailandés (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1507,7 +1473,7 @@ msgstr ""
 "_: tecláu\n"
 "Tailandés (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1516,7 +1482,7 @@ msgstr ""
 "_: tecláu\n"
 "Tifinagh (distribución marroquí) (+llatín/árabe)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1525,7 +1491,7 @@ msgstr ""
 "_: tecláu\n"
 "Tifinagh (fonéticu) (+llatín/árabe)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1534,7 +1500,7 @@ msgstr ""
 "_: tecláu\n"
 "Tajik"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1543,21 +1509,21 @@ msgstr ""
 "_: tecláu\n"
 "Turcomanu"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1566,7 +1532,7 @@ msgstr ""
 "_: tecláu\n"
 "Ucranianu"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1575,17 +1541,27 @@ msgstr ""
 "_: tecláu\n"
 "Tecláu urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Tecláu estauxunidense"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Tecláu estauxunidense (internacional)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Tecláu estauxunidense (internacional)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (Tecláu estauxunidense con 3 niveles per tecla)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1594,7 +1570,7 @@ msgstr ""
 "_: tecláu\n"
 "Uzbeku (cirílicu)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1603,7 +1579,7 @@ msgstr ""
 "_: tecláu\n"
 "Vietnamita \"filera numbérica\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1612,92 +1588,92 @@ msgstr ""
 "_: tecláu\n"
 "Yugoslavu (llatín)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Tecla Alt drecha"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Dambes tecles Mayúscula simultaneamente"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Tecles Control y Mayús simultaneamente"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Tecla Bloq mayus"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Tecles Mayús y Bloq mayus simultaneamente"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Tecles Ctrl y Alt simultaneamente"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Tecles Alt y Mayus simultaneamente"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Tecla \"Menú\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Tecla \"Windows\" esquierda"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Tecla \"Windows\" drecha"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Dambes tecles Control simultaneamente"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Dambes tecles Alt simultaneamente"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Tecla Mayús esquierda"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Tecla Mayús drecha"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Tecla Alt esquierda"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Tecla Control esquierda"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Tecla Control drecha"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1708,12 +1684,12 @@ msgstr ""
 "permitirá camudar ente los esquemes de tecláu estremaos\n"
 "(ex.: llatín y non llatín)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Avisu"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1724,257 +1700,227 @@ msgstr ""
 "Na instalación, necesitarás usar la tecla Control drecha\n"
 "pa camudar ente les distintes distribuciones de tecláu."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Mur - Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Estándar"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Mur xenéricu PS2 con rueda"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Mur Kensington Thinking"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 botón"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Mur xenéricu de 2 botones"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Mur xenéricu de 3 botones con emulación de rueda"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rueda"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serie"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Mur xenéricu de 3 botones"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan con emulación de rueda"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series con emulación de rueda"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Mur Logitech (serie, antigüa triba C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Mur Logitech (serie, antigüa triba C7) con emulación de rueda"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse con emulación de rueda"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "mur bus"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 botones"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 botones"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 botones con emulación de rueda"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Cualesquier mur PS/2 y USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Forciar evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Controlador S de Microsoft Xbox"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Mur VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Mur VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "dengún"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Ensin mur"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Probando'l mur"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Escueyi la triba del mur, por favor."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Escoyeta del mur"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "¿Emular el tercer botón?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Puertu del mur"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Por favor, escueyi'l puertu serie al que ta conectáu'l to mur."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulación de botones"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulación del botón 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulación del botón 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Por favor, prueba'l mur."
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "P'activar el mur,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "¡MUEVI LA TO RUEDA!"
@@ -2034,3 +1980,56 @@ msgstr "Executar configuración de gráficos Mageia"
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 "Requierse l'autenticación pa executar la configuración de gráficos Mageia"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr ""
+#~ "_: tecláu\n"
+#~ "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr ""
+#~ "_: tecláu\n"
+#~ "Polacu"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr ""
+#~ "_: tecláu\n"
+#~ "Armeniu (vieyu)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr ""
+#~ "_: tecláu\n"
+#~ "Cherokee silábicu"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr ""
+#~ "_: tecláu\n"
+#~ "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Mur - Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Mur VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Mur VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulación de botones"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulación del botón 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulación del botón 3"
diff --git a/po/az.po b/po/az.po
index dcae12f..c08dbb2 100644
--- a/po/az.po
+++ b/po/az.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-az\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2005-03-31 14:21+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -64,22 +64,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB və ya daha çox"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X verici"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "X vericisini seçin"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Çoxlu Başlıq quraşdırılması"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -88,12 +88,12 @@ msgstr ""
 "Sisteminiz çoxlu başlıq quraşdırmasını dəstəkləyir.\n"
 "Nə etmək istəyirsiniz?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Ekran kartınızın yaddaş böyüklüyünü seçin"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -101,82 +101,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Bütün başlıqları ayrı ayrı quraşdır"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama uzantısını işlət"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Yalniz \"%s\"%s kartını quraşdır"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Xüsusi"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Bağlantı quraşdırılması"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Çıx"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Qrafika Kartı"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Həlledilirlik"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Sına"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Seçimlər"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Əlavələr"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -189,32 +189,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Monitorunuzu seçin"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Monitorunuzu seçin"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Tax və İşlət"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Ümumi"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "E'malatçı"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -233,22 +233,22 @@ msgstr ""
 "seçməməyiniz çox vacibdir, əks halda monitor zərər görər.\n"
 "Seçərkən bir qərarsızlığa düşərsəniz, alçaq rezolyusiya seçin."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Üfüqi yeniləmə sür'əti"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Şaquli yeniləmə sür'əti"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Gedişatı seçin"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -263,7 +263,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -276,84 +276,84 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 rəng (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 min rəng (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 min rəng (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 million rəng (24 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Həlledilirliklər"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Digər"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Həlledilirlik və rəng dərinliyini seçin"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Qrafika kartı: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Oldu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Ləğv Et"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Yardım"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Qurğuların sınağı"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Qurğuları sınamaq istəyirsiniz?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Diqqət: Bu qrafika kartı ilə ediləcək sınaq kompüterinizi dondura bilər"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -364,159 +364,164 @@ msgstr ""
 "%s\n"
 "Bə'zi parametrləri dəyişdirməyi sınayın"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d saniyə sonra çıxılacaq"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Bu qurğu doğrudur?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "heç biri"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klavatura düzülüşü: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Klavatura düzülüşü: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Siçan növü: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitorun Şaquli Daraması: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitorun Üfüqi Yeniləməsi: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Ekran kartı: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Ekran kartı yaddaşı: %s KB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Rəng dərinliyi: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Həlledilirlik: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg sürücü: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg quraşdırılması"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Qrafika kartı: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X ilə Açılış"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Kompüterinizi avtomatik olaraq X ilə açılması üçün qura bilərəm.\n"
 "Açılışda X Window ilə başlamaq istəyirsiniz?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -537,922 +542,899 @@ msgstr ""
 "\n"
 "Bu xüsusiyyətə maliksiniz?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Televiziyanız hansı normu işlədir?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Çex dili (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Almanca"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "İspanca"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Fin dili"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Fransızca"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "İngiliz (UK) klaviaturası"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norveç dili"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polyak dili"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Rusca"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "İsveçcə"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US klaviaturası"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanca"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Ermenicə (köhnə)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Ermenicə (yazı makinası)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Ermenicə (fonetik)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Ərəb dili"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Estoniya dili"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azərbaycanca (latın)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belçika dili"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Benqal dili (İnscript sırası)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Benqal dili (Probhat sırası)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bolqar (fonetik)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bolqar (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazilya dili (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosniya"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Bosniya"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarus dili"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "İsveçcə (Alman sırası)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "İsveçrə dili (Fransız düzülüşü)"
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Ərəb dili"
+"Czech (QWERTZ)"
+msgstr "Çex dili (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Çex dili (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Almanca"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Almanca (ölü düymələr olmasın)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanaqari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danimarka dili"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Norveç dili)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norveç dili)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (İsveç)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (İsveç)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estoniya dili"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "İspanca"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Fin dili"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Yunanca"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Fransızca"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Fransızca"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Yunanca (politonik)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Yunanca (politonik)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "İngiliz (UK) klaviaturası"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gürcü dili (\"Rus\" sırası)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gürcü dili (\"Latın\" sırası)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Yunanca"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Yunanca (politonik)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati dili"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Qurmuxi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Xorvat dili"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Macar dili"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "İrlandiya Dili"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Yəhudi dili"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Yəhudi dili (Fonetik)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Farsca"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "İslandiya dili"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "İtalyan dili"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Yapon dili 106 düyməli"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kanada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "İngiliz (UK) klaviaturası"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Koreya klaviaturası"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Ərəb dili"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latın Amerika dili"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotian"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Farsca"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latış dili"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam dili"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedoniya dili"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar dili  (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolca (kiril)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Malta (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Malta (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Hollandiya dili"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norveç dili"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polyakca (QWERTY sırası)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polyakca (QWERTZ sırası)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Polyak dili"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portuqalca"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Fransız dili (Kanada/Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumın (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumın (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumın (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Rusca"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Rus dili (Fonetik)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "İsveçcə"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovencə"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakca (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakca (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Norveç dili)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (isveç/fin)"
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Tay klaviaturası"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbcə (kiril)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Siriak"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Siriak (fonetik)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII-ldüzülüşü)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil dili (Yazı makinası düzülüşü)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tay klaviaturası"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tay klaviaturası"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tay klaviaturası"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tacik klaviaturası"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Almanca"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Türk dili (müasir \"Q\" klaviatura)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Türk dili (müasir \"Q\" klaviatura)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrayna"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US klaviaturası"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Amerikan (US) klaviaturası (beynəlmiləl)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Amerikan (US) klaviaturası (beynəlmiləl)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Özbək dili (kiril)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vyetnam dili \"numeric row\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Yugoslav (latın)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Sağ Alt düyməsi"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Eyni zamanda iki Shift düyməsi "
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Eyni zamanda Control və Shift düymələri"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock düyməsi"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, fuzzy, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Eyni zamanda Ctrl və Alt düymələri"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Eyni zamanda Ctrl və Alt düymələri"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Eyni zamanda Alt və Shift düymələri"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menyu\" düyməsi"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Sol \"Windows\" düyməsi"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Sağ \"Windows\" düyməsi"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Eyni zamanda iki Control düyməsi "
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Eyni zamanda iki Alt düyməsi"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Sol Shift düyməsi"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Sağ Shift düyməsi"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Sol Alt düyməsi"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Sol Control düyməsi"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Sağ Control düyməsi"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1463,12 +1445,12 @@ msgstr ""
 "düymə ya da düymələr kombinasiyasını seçə bilərsiniz.\n"
 "(mis: latın və latın olmayan)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1479,257 +1461,227 @@ msgstr ""
 "Qurulum sırasında, fərqli klaviatura düzülüşləri arasında\n"
 "keçmək üçün Sağ Control düyməsini istifadə etməlisiniz."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Siçan"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standart"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Sıravi PS2 Çərxli Siçan"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Siçanı"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 düymə"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Sıravi 2 Düyməli Siçan"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Çərx emulyasiyalı sıravi 3 düyməli siçan"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Çərx"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serial"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Sıravi 3 Düyməli Siçan"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Çərx emulyasiyalı Logitech MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Siçan Sistemləri"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Çərx emulyasiyalı Logitech CC Seriyaları"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech mouse (serial ya da köhnə C7 növü)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Çərx emulyasiyalı Logitech siçan (serial, köhnə C7 növü)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Çərx emulyasiyalı Kensington Thinking siçanı"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 düyməli"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 düyməli"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Çərx emulyasiyalı 3 düymə"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Hər hansı bir PS/2 və USB siçan"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Siçansız"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "heç biri"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Siçansız"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Xahiş edirik, siçanınızın növünü seçin."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "əllə"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "3 düymə emulasiyası"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Siçan Qapısı"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Siçanınızın bağlı olduğu serial qapını seçin."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Düymə emulyasiyası"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Düymə 2 emulyasiyası"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3 Düymə Emulyasiyası"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Xahiş edirik, siçanınızı seçin"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Siçanınızı işə salmaq üçün,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "SİÇANIN ÇƏRXİNİ OYNADIN!"
@@ -1794,6 +1746,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Fransızca"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polyak dili"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Ermenicə (köhnə)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Ərəb dili"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Tay klaviaturası"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Siçan"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Siçansız"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Düymə emulyasiyası"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Düymə 2 emulyasiyası"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3 Düymə Emulyasiyası"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Türkcə (ənənəvi \"F\" klaviatura)"
 
diff --git a/po/be.po b/po/be.po
index 8073f44..93e96c8 100644
--- a/po/be.po
+++ b/po/be.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2000-09-24 12:30 +0100\n"
 "Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
 "Language-Team: be\n"
@@ -59,34 +59,34 @@ msgstr "32 Мб"
 msgid "64 MB or more"
 msgstr "64 Мб ці болей"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X сэервер"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, fuzzy, c-format
 msgid "Choose an X server"
 msgstr "X сэервер"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, fuzzy, c-format
 msgid "Multi-head configuration"
 msgstr "Канфігурацыя"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Пазначце памер відэапамяці"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -94,82 +94,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, fuzzy, c-format
 msgid "Configure all heads independently"
 msgstr "Настроіць панэль"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, fuzzy, c-format
 msgid "Use Xinerama extension"
 msgstr "Пашырэнне файла"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, fuzzy, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Наладка вашага сэансу"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Па выбару"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Настройка далучэння да Інтэрнэту"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Выхад"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, fuzzy, c-format
 msgid "Graphic Card"
 msgstr "Відэакарта: %s"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Манітор"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Памеры экрану"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Тэст"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Опцыі"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Дапаўненьні"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -182,32 +182,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Абярыце манітор"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Абярыце манітор"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Агульны"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, fuzzy, c-format
 msgid "Vendor"
 msgstr "Рэдактары"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -231,22 +231,22 @@ msgstr ""
 "вы можаце сапсаваць манітор.\n"
 "Калі вы сумняваецеся, абярыце кансерватыўныя настройкі."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Часціня гарызантальный разгорткі"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Часціня вертыкальнай разгорткі"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Абярыце дзеянне"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -261,7 +261,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -274,83 +274,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 колераў (8 бітаў)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 тысячы колераў (15 бітаў)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 тысяч колераў (16 бітаў)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 мільёнаў колераў (24 біты)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Аўтаматычна"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Памеры экрану"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Іншыя"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Выбар памераў экрану і глыбіні колеру"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Відэакарта: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Адмена"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Дапамога"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Праверка параметраў настройкі"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Ці жадаеце пратэсціраваць настройкі?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -358,159 +358,164 @@ msgid ""
 "Try to change some parameters"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, fuzzy, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d секундаў"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, fuzzy, c-format
 msgid "Is this the correct setting?"
 msgstr "Гэта дакладна?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "няма"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Тып клавіятуры: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Тып клавіятуры: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Тып мышы: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Манітор: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Часціня гар.разг. манітору: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Часціня верт.разг. манітору: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Відэакарта: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Відэапамяць: %s Кб\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Параметры глыбіні колеру: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Памеры экрану: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Сервер Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Настройка Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Відэакарта: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Запуск X пры старце сістэмы"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Можна настроіць сістэму для аўтаматычнага запуску X пасля старту сістэмы.\n"
 "Жадаеце, каб X стартаваў пры рэстарце?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -523,922 +528,899 @@ msgid ""
 "Do you have this feature?"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Чешскі (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Нямецкі"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Іспанскі"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Фінскі"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Французскі"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK клавіятура"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Нарвежскі"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Польскі"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Рускі"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Швецкі"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US клавіятура"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Албанская:"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Армянскі (стары)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Армянскі (typewriter)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Армянскі (фанетычны)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr ""
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Эстонскі"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Азербайджанскі (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Бельгійскі"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Армянскі (typewriter)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Бельгійскі"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Балгарскі (фанетычны)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Балгарскі (БДС)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Бразільскі (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Румынская:"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Румынская:"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Беларускі"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Швейцарскі (Нямецкая раскладка)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Швейцарскі (Французская раскладка)"
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Харвацкі"
+"Czech (QWERTZ)"
+msgstr "Чешскі (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Чешскі (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Нямецкі"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Нямецкі (няма заблакіраваных клавіш)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Авангард"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Дацкі"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Нарвежскі)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Нарвежскі)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Нарвежскі)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Эстонскі"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Іспанскі"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Фінскі"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Грэчаскі"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Французскі"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Французскі"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Армянскі (фанетычны)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Армянскі (фанетычны)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK клавіятура"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Грузінскі (\"Руская\" раскладка)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Грузінскі (\"Лацінская\" раскладка)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Грэчаскі"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr ""
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr ""
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Харвацкі"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Мадьярскі"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Ірландская:"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr ""
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Іўрыт"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Іўрыт (фанетычны)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Іранскі"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Ісландскі"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Італьянскі"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Японскі 106 клавіш"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Панама"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "UK клавіятура"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "UK клавіятура"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Армянскі (фанетычны)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Лаціна-Амерыканскі"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Лаціна"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Іранскі"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Латвійская:"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Малазыя"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Македонія"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr ""
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr ""
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr ""
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Галандскі"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Нарвежскі"
+
+#: ../lib/keyboard.pm:266
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Опера"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Польскі (стандартная раскладка)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Польскі (qwertz раскладка)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Польскі"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Партугальскі"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Канадскі (Квебэк)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Румынская:"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Румынская:"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Румынская:"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Рускі"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Рускі (фанетычны)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Швецкі"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Славенскі"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Славацкі (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Славацкі (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Dvorak (Нарвежскі)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Тайская клавіятура"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr ""
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Армянскі (фанетычны)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Такелаў"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Армянскі (typewriter)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Тайская клавіятура"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Тайская клавіятура"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Тайская клавіятура"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Тайская клавіятура"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Нямецкі"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Турэцкі (сучасная \"Q\" мадэль)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Турэцкі (сучасная \"Q\" мадэль)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Украінскі"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Опера"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US клавіятура"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US клавіятура (міжнародная)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US клавіятура (міжнародная)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Вьетнамскі \"нумар радка\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Азербайджанскі (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr ""
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, fuzzy, c-format
 msgid "\"Menu\" key"
 msgstr "Рэдактар мэню"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, fuzzy, c-format
 msgid "Left \"Windows\" key"
 msgstr "Паводзіны вокнаў"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, fuzzy, c-format
 msgid "Left Control key"
 msgstr "Кантролер гучнасьці"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, fuzzy, c-format
 msgid "Right Control key"
 msgstr "Кантролер гучнасьці"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1446,12 +1428,12 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Увага!"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1459,257 +1441,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Мыш"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Стандартны"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, fuzzy, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Звычайная мыш з 2 кнопкамі"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, fuzzy, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, fuzzy, c-format
 msgid "1 button"
 msgstr "3 кнопкі"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Звычайная мыш з 2 кнопкамі"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, fuzzy, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Звычайная мыш з 3 кнопкамі"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "З колам"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "паслядоўная"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Звычайная мыш з 3 кнопкамі"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, fuzzy, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, fuzzy, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (паслядоўная, стары тып C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, fuzzy, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (паслядоўная, стары тып C7)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, fuzzy, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, fuzzy, c-format
 msgid "busmouse"
 msgstr "Няма мышы"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 кнопкі"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 кнопкі"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Агульнае"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Няма мышы"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "няма"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Няма мышы"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, fuzzy, c-format
 msgid "Please choose your type of mouse."
 msgstr "калі ласка, пазначце тып вашай мышы."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "Выбар мовы"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Эмуляваць трэцюю кнопку?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Порт мышы"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Калі ласка, пазначце послядоўны порт, да якога падключана вашая мыш."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:558
-#, fuzzy, c-format
-msgid "Button 2 Emulation"
-msgstr "Калькулятар"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Калі ласка, зрабіце некалькі рухаў мышшу."
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, fuzzy, c-format
 msgid "To activate the mouse,"
 msgstr "Калі ласка, зрабіце некалькі рухаў мышшу."
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "Рушце колам мышы!"
@@ -1773,6 +1725,49 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Французскі"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Польскі"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Армянскі (стары)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Харвацкі"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Тайская клавіятура"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Мыш"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Няма мышы"
+
+#, fuzzy
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Калькулятар"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Турэцкі (традыцыёная \"F\" мадэль)"
 
diff --git a/po/bg.po b/po/bg.po
index 646abec..b6f82a2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-bg\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2004-09-15 13:27+0200\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -64,34 +64,34 @@ msgstr "32 МБ"
 msgid "64 MB or more"
 msgstr "64 МБ или повече"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X сървър"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Изберете X сървър"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Изберете капацитет на паметта на графичната си карта"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -99,82 +99,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Настройка на всички глави по отделно"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Използвай разширението Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Настройка само на карта \"%s\"(%s)"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Клиентска"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Настройка на връзката"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Изход"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Графична карта"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Монитор"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Разделителна способност"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Тест"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Опции"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Приставки"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -187,32 +187,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Изберете монитор"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Изберете монитор"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug & Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Общ"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Производител"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -237,22 +237,22 @@ msgstr ""
 "повредите монитора си.\n"
 " Ако имате някакви съмнения, изберете консервативна настройка."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Хоризонтална скорост на възстановяване"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Вертикална скорост на възстановяване"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Изберете действие"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -267,7 +267,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -280,84 +280,84 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 цвята (8 бита)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 хиляди цвята (15 бита)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 хиляди цвята (16 бита)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 милиона цвята (24 бита)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Разделителна способност"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Друга"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Изберете разделителна способност и дълбочина на цветовете"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Графична карта: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Отказ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Помощ"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Проверка на настройката"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Искате ли да тествате настройките?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Внимание: тестването на тази графична карта може да замрази компютъра ви"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -368,159 +368,164 @@ msgstr ""
 "%s\n"
 "Опитайте да промените някой параметри"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Позволено в %d секунди"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Всичко правилно ли е ?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "няма"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Тип клавиатура: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Тип клавиатура: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Тип мишка: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Монитор: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Хоризонтална синхронизация на монитора: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Вертикално опресняване на монитора: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Графична карта: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Графична памет: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Дълбочина на цвета: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Разделителна способност: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg драйвер: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Настройка на Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Графична карта: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X при стартиране на системата"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Компютъра ви може автоматично, да влезе в X при стартиране.\n"
 "Искате ли X да се стартира, когато рестартирате системата?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -533,922 +538,899 @@ msgid ""
 "Do you have this feature?"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Какъв е типът на използваният TV ?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Чешка (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Немска"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Дворак"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Испанска"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Финландска"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Френска"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK клавиатура"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Норвежка"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Полска"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Руска"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Шведска"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US клавиатура"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Албанска"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Арменска (стара)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Арменска (пишеща машина)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Арменска (фонетичен)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Арабски"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Естонска"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Азербайджанска (латиница)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Белгийска"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Бенгалска (Inscript-подредба)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Бенгалска (Probhat-подредба)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Българска (фонетичен)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Българска (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Бразилска (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Босненска"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Босненска"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Беларуска"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Швейцарска (немска наредба)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Швейцарска (френски наредба)"
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Арабски"
+"Czech (QWERTZ)"
+msgstr "Чешка (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Чешка (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Немска"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Немска (без неработещи клавиши)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Давенаджари"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Датска"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Дворак (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Дворак (Норвежка)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Дворак (Норвежка)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Дворак (US)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Дворак (Норвежка)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Дворак (Шведска)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Дворак (Шведска)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Естонска"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Испанска"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Финландска"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Гръцка"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Френска"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Френска"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Арменска (фонетичен)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Арменска (фонетичен)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK клавиатура"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Грузинска (\"Руска\" наредба)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Грузинска (\"Латинска\" наредба)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Гръцка"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Гуаджарати"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Гурмукчи"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Хърватска"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Унгарска"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Инуктитут"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Израелска"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Израелска (фонетична)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Иранска"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Исландска"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Италианска"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Японска 106 клавиша"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Канада"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "UK клавиатура"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Корейска клавиатура"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Арабски"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Латиноамериканска"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Лаоска"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Иранска"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Латвийска"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Малайлам"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Македонска"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Майнмар (бирманска)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Монголска (кирилица)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Малтийска (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Малтийска (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Холандска"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Норвежка"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Орийска"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Полска (QWERTY наредба)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Полска (QWERTZ наредба)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Полска"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Португалска"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Канадска (Квебек)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Румънска (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Румънска (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Румънска (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Руска"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Руска (фонетична)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Шведска"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Словенска"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Словашка (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Словашка (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Саами (норвежка)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Саами (норвежка)"
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Тайванска клавиатура"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Сръбска (кирилица)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Сирийски"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Сирийски (фонетичен)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Телугу"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Тамилска (ISCII-подредба)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Тамилска (пишеща машина)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Тайванска клавиатура"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Тайванска клавиатура"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Тайванска клавиатура"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Таджикистанска клавиатура"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Немска"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Турска (модерен \"Q\" модел)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Турска (модерен \"Q\" модел)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Украинска"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Орийска"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US клавиатура"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US клавиатура (международна)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US клавиатура (международна)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Узбекистанска (кирилица)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Виетнамска \"числова редица\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Югославска (латиница)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Десен Alt клавиш"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Двата Shift клавиша едновременно"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control и Shift клавиши едновремено"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock клавиш"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, fuzzy, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Ctrl и Alt клавиши едновременно"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl и Alt клавиши едновременно"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt и Shift клавиши едновременно"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\" клавиш"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Ляв \"Windows\" клавиш"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Десен \"Windows\" клавиш"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Двата Ctrl клавиша едновременно"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Двата Alt клавиша едновременно"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Ляв Shift клавиш"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Десен Shift клавиш"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Ляв Alt клавиш"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Ляв клавиш Ctrl"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Десен Control клавиш"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1459,12 +1441,12 @@ msgstr ""
 "ще ви позволи да избирате различни клавиатурни подредби\n"
 "(напр. latin и не latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Предупреждение"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1472,257 +1454,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Мишка на Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Стандартна"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Обикновенна PS2 мишка"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington THinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genuis NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 бутон"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Обикновенна 2-бутонна мишка"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Обикновенна 3-бутонна мишка с емулация на колелце"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Wheel"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "серийна"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Обикновенна 3-бутонна мишка"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, fuzzy, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series с емулация на колелце"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (серийна, от стария тип C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (серийна, от стария тип C7) с емулация на колелце"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington THinking Mouse с колелце"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "BUS мишка"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 бутона"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 бутона"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 бутона с емулация на колелце"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Без мишка"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "няма"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Без мишка"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Моля, изберете тип на мишката."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "ръчно"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Да симулирам ли трети бутон ?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Порт на мишката"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Моля, изберете към кой сериен порт е свързана мишката ви."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Имитация на бутони"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Имитация на 2 бутона"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Имитация на 3 бутона"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Моля, пробвайте мишката си"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "За да активирате мишката си,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "БУТНЕТЕ ТОПЧЕТО !"
@@ -1785,6 +1737,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Дворак"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Френска"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Полска"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Арменска (стара)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Арабски"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Тайванска клавиатура"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Мишка на Sun"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Без мишка"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Имитация на бутони"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Имитация на 2 бутона"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Имитация на 3 бутона"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Турска (традиционен \"F\" модел)"
 
diff --git a/po/bn.po b/po/bn.po
index e34089d..90437ef 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX HEAD\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2005-03-19 23:18+0600\n"
 "Last-Translator: Samia <mailsamia2001@yahoo.com>\n"
 "Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -62,22 +62,22 @@ msgstr "৩২ এমবি"
 msgid "64 MB or more"
 msgstr "৬৪ এমবি অথবা আরও বেশী"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X সার্ভার"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "একটি X সার্ভার পছন্দ করুন"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-head কনফিগারেশন"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -86,12 +86,12 @@ msgstr ""
 "আপনার সিস্টেম Multiple Head কনফিগারেশন সাপোর্ট করে।\n"
 "আপনা কি করতে চান?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "আপনার গ্রাফিক কার্ডের জন্য মেমরী সাইজ নির্ধারন করুন"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -99,84 +99,84 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "সমস্থ head-গুলিকে আলাদাভাবে কনফিগার কারো"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama এক্সটেনশন ব্যবহার করো"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "শুধু \"%s\"%s কার্ড কনফিগ করো"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "ব্যবস্থা"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "সংযোগ কনফিগারেশন"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "বাহির"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "গ্রাফিক কার্ড"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "মনিটর"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "রেজুলেশন"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "পরীক্ষা"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "অপশন"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "প্লাগ-ইন"
 
 # সাম: broken কি সেন্সে ব্যবহৃত হয়েছে?
 # অসম্পূর্ণ নাকি corrupt?  
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "আপনার Xorg কনফিগারেশন ফাইলটি অসম্পূর্ণ, এটি অগ্রাহ্য করছি। "
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -189,32 +189,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Head #%d -এর জন্য একটি মনিটর পছন্দ করুন"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "একটি মনিটর পছন্দ করুন"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "প্লাগ'এন প্লে"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "সাধারন"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "পরিবেশক"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -234,22 +234,22 @@ msgstr ""
 "\n"
 "এটা খুব গুরুত্বপূর্ণ যে"
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horizontal রিফ্রেশ রেট"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertical রিফ্রেশ রেট"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "কার্য পছন্দ করুন"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -264,7 +264,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -277,85 +277,85 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "২৫৬ রঙ (৮ বিট)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "৩২ হাজার রঙ (১৫ বিট)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "৬৫ হাজার রঙ (১৬ বিট)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "১৬ লক্ষ রঙ (২৪ বিট)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "সয়ংক্রিয়"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "রেজুলেশন"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "অন্যান্য"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "রঙের রেজুলেশন এবং গভীরতার পছন্দ করুন"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "%s গ্রাফিক কার্ড"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "ঠিক আছে"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "বাতিল"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "সাহায্য"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "এই কনফিগারেশনটি পরীক্ষা করো"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "আপনি কি এই কনফিগারেশন পরীক্ষা করতে চান?"
 
 # Warning-এর বাংলা "নোটিশ" লিখলাম
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "নোটিশ: এই গ্রাফিক্স কার্ডটি পরীক্ষা করতে গিয়ে আপনার কম্পিউটারটি অচল হয়ে যেতে পারে"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -366,152 +366,157 @@ msgstr ""
 "%s\n"
 "কিছু মান পরিবর্তনের চেষ্টা করুন"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d সেকেন্ডের মধ্যে বের হয়ে যাবে"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "এটাই কি সঠিক সেটিং?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "না"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "কীবোর্ড লে-আউট: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "কীবোর্ড লে-আউট: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "%s ধরণের মাউস\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "মনিটর: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "মনিটরের HorizSync: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "মনিটরের VertRefresh: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "গ্রাফিক্স কার্ড: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "গ্রাফিক্স মেমরী: %s\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "রঙের গভীরতা: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "রেজুলেশন: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg ড্রাইভার: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg কনফিগারেশন"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "%s গ্রাফিক কার্ড"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "শুরু থেকেই গ্রাফিকাল ইন্টারফস থাকবে"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
@@ -519,7 +524,7 @@ msgstr ""
 "কম্পিউটার সেট করতে পারি।\n"
 "আপনি কি রিবুটের পরে Xorg চালু করতে চান?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -539,191 +544,104 @@ msgstr ""
 "\n"
 "আপনার কি এই সুবিধাটি আছে?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "আপনি কি ধরণের টিভি ব্যবহার করছেন?"
 
 # সাম: 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "অনান্য"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "চেজ (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "জার্মান"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "ডিভোর্ক"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "স্পেনিশ"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "ফিনিস"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "ফ্রান্স"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK কি-বোর্ড"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "নরিয়"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "পোলিশ"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "রাশিয়ান"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "সুইডিশ"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US কি-বোর্ড"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "আরবীয়"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "আরমেনীয় (পুরনো)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "আরমেনীয় (টাইপরাইটার)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "আরমেনীয় (উচ্চারণভিত্তিক)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "আরবীয়"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "ইষ্টোনিয়ান"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "আজেরবাঈদজানি (ল্যাটিন)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "বেলজিয়ান"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "বাংলা (ইনস্ক্রিপ্ট লে-আউট)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "বাংলা (প্রভাত লে-আউট)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "বুলগেরিয়ান (উচ্চারণভিত্তিক)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "বুলগেরিয়ান (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "ব্রাজিলিয়ান (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -731,79 +649,84 @@ msgid ""
 msgstr "বসনিয়ান"
 
 # sam
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "যংকা/তিব্বতীয়"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "বেলুরাশিয়ান"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "সুইশ (জার্মান লে-আউট)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "সুইশ (ফ্রেঞ্জ লে-আউট)"
 
-# sam: what about the leading '_: keyboard\n
-# banglish?
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "চেরোকী সিলাবিক্স"
+"Czech (QWERTZ)"
+msgstr "চেজ (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "চেজ (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "জার্মান"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "German (কোন dead key ছাড়া)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "দৈবনগরী"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "ডেনিশ"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "ডেভোর্ক (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -811,7 +734,7 @@ msgid ""
 msgstr "ডেভোর্ক (Esperanto)"
 
 # sam
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -819,14 +742,14 @@ msgid ""
 msgstr "ডেভোরাক (ফ্রেঞ্চ‌)"
 
 # sam
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "ডেভোরাক (ইউকে)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -834,176 +757,209 @@ msgid ""
 msgstr "ডেভোর্ক (Norwegian)"
 
 # sam
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "ডেভোরাক (পোলিশ)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "ডেভোর্ক (Swedish)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "ইষ্টোনিয়ান"
 
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "স্পেনিশ"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "ফিনিস"
+
 # sam
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "ফারোইয"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "ফ্রান্স"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "ফ্রান্স"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "গ্রীক (পলিটোনিক)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "গ্রীক (পলিটোনিক)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK কি-বোর্ড"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "জর্জিয়ান (\"রাশিয়ান\" লে-আউট)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "জর্জিয়ান (\"ল্যাটিন\" লে-আউট)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "গ্রীক"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "গ্রীক (পলিটোনিক)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "গুজরাটি"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "গুর্মুখী"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "ক্রোয়েশিয়ান"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "হাঙ্গেরিয়ান"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "আইরিশ"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "ইনাকটিটুট"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "ইসরাঈল"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "ইসরাঈল (উচ্চারণভিত্তিক)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "ইরানি"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "আইসল্যান্ডের"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "ইটালীয়ান"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "জাপানীজ ১০৬ কী"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "কান্নাডা"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kyrgyz কি-বোর্ড"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1011,119 +967,126 @@ msgid ""
 msgstr "কোরিয়ান কীবোর্ড"
 
 # sam
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "কুর্দিশ (আরবী লিপি)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "ল্যাটিন আমেরিকান"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "ল্যাওটিআন"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "ইরানি"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "লাটভিয়ান"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "মালায়লাম"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "ম্যাসিডোনিয়ান"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "মিয়ানমার (বার্মিজ)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "মঙ্গলীয়ান (কীরিল্লিক)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "মালটেসে (ইউকে)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "মালটেসে (ইউএস)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "ডাচ্‌"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "নরিয়"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "ওরিয়া"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "পোলিশ (qwerty লে-আউট)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1131,84 +1094,98 @@ msgid ""
 msgstr "পোলিশ (qwertz  লে-আউট)"
 
 # sam
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "পাশতু"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "পর্তুগীজ"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "কানাডিয়ান (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "রোমানিয়ান (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "রোমানিয়ান (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "রোমানিয়ান (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "রাশিয়ান"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "রাশিয়ান (উচ্চারণভিত্তিক)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "সুইডিশ"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "স্লোভেনিয়ান"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "স্লোভেকিয়ান (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "স্লোভেকিয়ান (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1216,99 +1193,91 @@ msgid ""
 msgstr "ছ্যামী (norwegian)"
 
 # আচ্ছা ফিনিস বানানটা অন্য কিছু লেখা উচিত্‍‌ না? কারন আমাদের দেশে ফিনিস বলতে একটা মশা মারার ঔষধের নাম বোঝায়। আর এখন যে ডেঙ্গু চারিদিকে!!!
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "ছ্যামী (সুইডিশ/ফিনিস)"
 
-# sam
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "সিন্ধি"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "সার্বিয়ান (কিরিল্লিক)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "স্যাইরিক"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "স্যাইরিক (উচ্চারণভিত্তিক)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "তেলেগু"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "তামিল (ISCII-লে-আউট)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "তামিল (টাইপরাইটার-লে-আউট)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "থাই কী-বোর্ড (Kedmanee-লে-আউট)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "থাই কী-বোর্ড (TIS-820-লে-আউট)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "থাই কী-বোর্ড (Pattachote-লে-আউট)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1316,28 +1285,28 @@ msgid ""
 msgstr "তাজিক কী-বোর্ড"
 
 # sam
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "তুর্কমেনীয়"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "টার্কিস (ঐতিহ্যবাহী \"Q\" মডেল)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "টার্কিস (ঐতিহ্যবাহী \"Q\" মডেল)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1345,130 +1314,140 @@ msgid ""
 msgstr "উকরানিয়ান"
 
 # sam
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "উর্দূ কিবোর্ড"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US কি-বোর্ড"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US কী-বোর্ড (আন্তর্জাতিক)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US কী-বোর্ড (আন্তর্জাতিক)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "উজবেক (কীরিল্লিক)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "ভিয়েতনামিজ \"numeric row\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "ইয়ুগস্লোভিয়ান (ল্যাটিন)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "ডান Alt কী"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "পরপর দু'টি Shift কী"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "পরপর Control এবং Shift কী"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock কী"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift এবং CapsLock কী একই সাথে"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "পরপর Control এবং Alt কী"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "পরপর Alt এবং Shift কী"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\" কী"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "বাম \"Windows\" কী"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "ডান \"Windows\" কী"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "পরপর দু'টি Control কী"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "পরপর দু'টি Alt কী"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "বাম Shift কী"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "ডান Shift কী"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "বাম Alt কী"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "ডান Alt কী"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "ডান Control কী"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1479,12 +1458,12 @@ msgstr ""
 "আপনি কী বা কী এর কম্বিনেশন পছন্দ করতে পারেন\n"
 "(যেমন: ল্যাটিন এবং বাংলা)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "নোটিশ"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1495,258 +1474,228 @@ msgstr ""
 "ইনস্টল চলাকালীন, আপনাকে ডান Control কী ব্যবহার\n"
 "করে বিভিন্ন লে-আউটের মধ্যে পরিবর্তন করতে হবে।"
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "সান - মাউস"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "সাধারণ"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "সাধারণ PS2 চাকা মাউস"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking মাউস"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "জিনিয়াস NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "জিনিয়াস NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "মাইক্রসফ্ট এক্সপ্লোরার"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "১ বাটন"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "সাধারণ ২ বাটন মাউসের অনুকরণ করো"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "চাকার সাথে ৩ বাটন মাউসের অনুকরণ করো"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "চাকা"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "সিরিয়াল"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "সাধারণ ২৩ বাটন মাউস"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "মাইক্রসফ্ট IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "লজিটেক্ MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "চাকার অনুকরণে লজিটেক্ MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "মাউস সিস্টেম"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "লজিটেক্ CC সিরিজ"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "চাকার অনুকরণে লজিটেক্ CC সিরিজ"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "লজিটেক্ MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM সিরিজের"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM হিটট্যাবলেট"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (সিরিয়াল, পুরাতন C7 ধরনের)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "চাকার অনুকরণে Logitech Mouse (সিরিয়াল, পুরাতন C7 ধরনের)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "চাকা অনুকরণে Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "২ বাটন"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "৩ বাটন"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "চাকা অনুকরণে ৩ বাটন"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "সর্বজনীন"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "যে কোন PS/2 এবং ইউএসবি মাউস"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
 # sam
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "মাইক্রোসফ্ট Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "কোন মাউস নেই"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "না"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "কোন মাউস নেই"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "আপনার মাউসের ধরণ পছন্দ করুন"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "হাতে হাতে পছন্দ"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "তৃতীয় বাটনকে অনুকরণ করব?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "মাউস পোর্ট"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "অনুগ্রহ করে আপনার মাউসটি যে সিরিয়াল পোর্টের সাথে সংযুক্ত আছে তা পছন্দ করুন।"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "মাউসের বাটনগুলোর অনুকরণ"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "২ বাটন বিশিষ্ট মাউসকে অনুকরণ করো"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "৩ বাটন বিশিষ্ট মাউসকে অনুকরণ করো"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "অনুগ্রহ করে মাউসটি পরীক্ষা করুন"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "মাউসটি সক্রিয় করার জন্য,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "আপনার মাউসের চাকাটি ঘোরান!"
@@ -1810,6 +1759,55 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "ডিভোর্ক"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "ফ্রান্স"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "পোলিশ"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "আরমেনীয় (পুরনো)"
+
+# sam: what about the leading '_: keyboard\n
+# banglish?
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "চেরোকী সিলাবিক্স"
+
+# sam
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "সিন্ধি"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "সান - মাউস"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "কোন মাউস নেই"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "মাউসের বাটনগুলোর অনুকরণ"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "২ বাটন বিশিষ্ট মাউসকে অনুকরণ করো"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "৩ বাটন বিশিষ্ট মাউসকে অনুকরণ করো"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "টার্কিস (ঐতিহ্যবাহী \"F\" মডেল)"
 
diff --git a/po/br.po b/po/br.po
index f4bc0ad..d2c1fdd 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 10.2\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2007-02-07 14:29+0100\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
@@ -61,22 +61,22 @@ msgstr "32 Mo"
 msgid "64 MB or more"
 msgstr "64 Mo pe vuioc'h"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "servijer X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Dibabit ur servijer X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Kefluniañ meur a benn"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -85,12 +85,12 @@ msgstr ""
 "Meur a benn en eus ho reizhiad.\n"
 "Petra 'teus c'hoant d'ober ?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Dibabit ment memor ho kartenn c'hrafek"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -98,82 +98,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Implijit Xinemara"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Kefluniadur hep ken ar gartenn « %s » %s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personelañ"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Kefluniañ ar gartenn c'hrafek hag ar skramm"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Kuitaat"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Kartenn C'hrafek"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Skramm"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Spister"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Testiñ"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Dibarzhioù"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Lugentoù"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Sac'het eo restr kefluniadur Xorg; emaon o tremen anezhañ."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -186,32 +186,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Dibabit ur skramm evit ar penn #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Dibabit ur skramm"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Lug ha c'hoari"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Rummel"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Gwerzher"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -235,22 +235,22 @@ msgstr ""
 "a zo en tu-hont da varregezh ho skramm : gallout a rafe gwastañ ho skramm\n"
 " M'hoc'h eus douetañs, dibabit ur c'hefluniadur fur."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Feur freskaat a-led"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Feur freskaat a-serzh"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Dibabit al lugentoù"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -265,7 +265,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -278,83 +278,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 liv (8 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil liv (15 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil liv (16 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milion a livioù (24 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Emgefreek"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Spisterioù"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "All"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Dibabit ar spister ha donder al livioù"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Kartenn c'hrafek : %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Mat eo"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Nullañ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Skoazell"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Amprouiñ ar c'hefluniadur"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Mennout a rit amprouiñ ar c'hefluniadur ?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -365,157 +365,162 @@ msgstr ""
 "%s\n"
 "Klaskit kemmañ un dibarzh bennak"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Echu eo da %d eilenn"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Ha reizh eo ar c'hefluniadur ?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "ket"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "ya"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Reizhadur ar toullaouegik : %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Reizhadur ar toullaouegik : %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Seurt logodenn : %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Skramm : %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Kempredañ-led ar skramm : %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Freskañ-serzh ar skramm : %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Kartenn c'hrafek : %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memor grafek : %s ko\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Donder liv : %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Spister : %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Sturier Xorg : %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Staliadur Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Dibarzhioù hollek"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Dibaboù ar gartenn c'hrafek"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Bevaat an treuzwel (astenn Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X pa loc'her"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Lañsañ Xorg ent emgefreek pa loc'ho"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, fuzzy, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -528,922 +533,899 @@ msgid ""
 "Do you have this feature?"
 msgstr "Hag an arc'hwel-mañ hoc'h eus ?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Peseurt skinwel oc'h implij ?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "hini all"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tchek (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Alamanek"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spagnolek"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finnek"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Gallek"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Stokellaoueg RU"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norvegek"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polonek"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Rusiek"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Svedek"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Stokellaoueg SUA"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanek"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenianek (kozh)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenianek (skriverez)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenianek (soniadel)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabek"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Asturianek"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjanek (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgianek"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalek (reizhadur Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalek (reizhadur Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgarek (soniadel)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgarek (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazilek (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosniek"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongka/Tibetanek"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarusek"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Suis (reizhadur alaman)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Suis (reizhadur gall)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr ""
+"Czech (QWERTZ)"
+msgstr "Tchek (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tchek (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Alamanek"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Alaman (stokell marv ebet)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagariek"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danek"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Gallek)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (RU)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norvegek)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polonek)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Svedek)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonek"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spagnolek"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finnek"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faeroek"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Gallek"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Gallek"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Gresianek"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Gresianek"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Stokellaoueg RU"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Jorjianek (reizhadur \"Rusiek\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Jorjianek (reizhadur \"Latin\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Gresianek"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Gresianek"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujartiek"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukek"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroatek"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hungarek"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Iwerzhonek"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelian"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelekian (soniadel)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iraniek"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandek"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italianek"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japanek (106 stokell)"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kanadian"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgizek"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Stokellaoueg korean"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdek"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Amerikan Latin"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laosek"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Lituanek"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Letonek"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalamek"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maorek"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonek"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr ""
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolek (lizherenneg ar ruseg)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltek (RU)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltek (SUA)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nijerek"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Hollandek"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norvegek"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriyaek"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polonek (reizhadur qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polonek (reizhadur qwerty)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashtounek"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugalek"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadian (Kebek)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romaniek (Yawertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romaniek (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Romaniek (Yawertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Rusiek"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Rusianek (soniadel)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Svedek"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovenek"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhalek"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakek (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakek (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Sami (norvegek)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Samiek (svedek/finnek)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindiek"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbiek (lizherenneg ar ruseg)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Siriak"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Siriak (soniadel)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telegu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamoul (reizhadur ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamoul (reizhadur ar skriverez)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tailh (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tailh (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tailh (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagek (reizhadur marokek) (+latin/arabek)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagek (reizhadur soniadel) (+latin/arabek)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadjik"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmenek"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turkek (arnevez doare \"Q\")"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turkek (arnevez doare \"Q\")"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainek"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Stokellaoueg urduek"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Stokellaoueg SUA"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Stokellaoueg SUA (etrevroadel)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Stokellaoueg SUA (etrevroadel)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Ouzbek (lizherenneg ar ruseg)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Yezh ar Viet-Nam QUERTY \"linenn sifroù\""
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Yougoslaviek (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Stokell Alft a-zehoù"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Stokell krouilh pennlizh"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Touchenn ar meuziad"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Stokell « Prenestr » a-gleiz"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Stokell « Prenestr » a-zehoù"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Stokell Shift a-gleiz"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Stokell Shift a-zehoù"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Stokell Alt a-zehoù"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Stokell Control a-gleiz"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Stokell Control a-zehoù"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1451,12 +1433,12 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Hoc’h evezh"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1464,258 +1446,228 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Logodenn Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Skouer"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Logodenn rummel PS2 rodellek"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Logodenn Kensington Thinking"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 nozelenn"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Logodenn rummel 2 nozelenn"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Logodenn rummel 3 nozelenn gant kendarvanerezh ar rodell"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rodel"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "a-steud"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Logodenn rummel 3 nozelenn"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan gant kendarvanerezh ar rodell"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech doare CC"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech doare CC gant kendarvanerezh ar rodell"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "Doare MM"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logodenn Logitech (a-steud, seurt C7 kozh)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr ""
 "Logodenn Logitech (a-steud, seurt C7 kozh) gant kendarvanerezh ar rodell"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Logodenn Kensington Thinking gant kendarvanerezh ar rodell"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "Logodenn bus"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 nozelenn"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 nozelenn"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 nozelenn gant kendarvanerezh ar rodell"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Hollvedel"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Logodenn bennak (PS/2 pe USB)"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Kontroller Microsoft Xbox S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Logodenn VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Logodenn VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "hini ebet"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Logodenn ebet"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "O testiñ al logodenn"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Dibabit seurt ho logodenn, mar plij."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Choaz al logodenn"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Kendarvan an trede nozelenn ?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Porzh al logodenn"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Dibabit ar porzh a-steud m'eo luget ho logodenn outañ, mar plij."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Kendarvanerezh an nozeloù"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Kendarvanerezh an eil nozel"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Kendarvanerezh an trede nozel"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Testan ak logodenn, mar plij"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Da bevaat al logodenn,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "FIÑV HO RODELL !"
@@ -1779,6 +1731,49 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Gallek"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polonek"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenianek (kozh)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindiek"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Logodenn Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Logodenn VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Logodenn VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Kendarvanerezh an nozeloù"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Kendarvanerezh an eil nozel"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Kendarvanerezh an trede nozel"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Turkek (hengounel doare \"F\")"
 
diff --git a/po/bs.po b/po/bs.po
index a648857..b997973 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2006-09-13 19:15+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -64,22 +64,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB ili više"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Izaberite X server"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-head konfiguracija"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -88,12 +88,12 @@ msgstr ""
 "Vaš sistem podržava konfiguraciju više glava.\n"
 "Šta želite učiniti?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Izaberite veličinu memorije vaše grafičke kartice"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -104,82 +104,82 @@ msgstr ""
 "ponuditi dodatne mogućnosti.\n"
 "Želite li ga koristiti?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Konfiguriši sve glave odvojeno"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Koristi Xinerama ekstenziju"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Podesi samo karticu \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Vlastito"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Podešavanje grafičke kartice i monitora"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Izlaz"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafička karta"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Rezolucija"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opcije"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Dodaci"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Vaša Xorg konfiguraciona datoteka je pokvarena, ignorišem je."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -192,32 +192,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Izaberite monitor za glavu #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Izaberite monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Opšti"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Proizvođač"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -239,22 +239,22 @@ msgstr ""
 "raspon izvan mogućnosti vašeg monitora: time možete oštetiti monitor.\n"
 " Ako niste sigurni, izaberite najmanju opciju."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Brzina horizontalnog osvježavanja"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Brzina vertikalnog osvježavanja"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Izaberi akciju"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -269,7 +269,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -282,83 +282,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 boja (8 bita)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 hiljada boja (15 bita)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 hiljada boja (16 bita)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miliona boja (24 bita)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatski"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Rezolucije"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Ostalo"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Izaberite rezoluciju i broj boja"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafička karta: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Testiranje konfiguracije"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Želite li testirati konfiguraciju?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Upozorenje: testiranje ove grafičke karte može zalediti računar"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -369,157 +369,162 @@ msgstr ""
 "%s\n"
 "Probajte promijeniti neke parametre"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Napuštam za %d sekundi"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Da li je ovo ispravno?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "nijedan"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D hardversko ubrzanje: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Raspored tastature: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Raspored tastature: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Vrsta miša: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HorizSync: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertRefresh: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafička karta: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafička memorija: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Broj boja: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rezolucija: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg drajver: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg konfiguracija"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opcije grafička karte"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Uključi prozirnost (Composite ekstenzija)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Koristi hardverski ubrzan pokazivač miša"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Uključi RENDER ubrzanje (ovo može izazvati greške kod prikaza teksta)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Uključi identičan prikaz na vanjskom monitoru"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Uključi identičan prikaz na drugom ekranu"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Uključi BIOS kombinaciju tipki za promjenu ekrana"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Koristi EXA umjesto XAA (bolje performanse za Render i Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Grafički interfejs pri pokretanju"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Automatski pokreni grafičko okruženje (Xorg) nakon starta sistema"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -540,922 +545,899 @@ msgstr ""
 "\n"
 "Imate li ovu mogućnost?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Koji standard koristi vaš TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "ostalo"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Češka (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Njemačka"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Španska"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finska"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francuska"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK tastatura"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norveška"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Poljska"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Ruska"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Švedska"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US tastatura"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanska"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenska (stara)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenska (pisaća mašina)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenska (fonetska)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arapska"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Estonska"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbejdžanska (latinica)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgijska"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalska (Inscript raspored)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalska (Probhat raspored)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bugarska (fonetska)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bugarska (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazilska (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosanska"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetanska"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Bjeloruska"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Švicarska (njemački raspored)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Švicarska (francuski raspored)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Češka (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Češka (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Njemačka"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Njemačka (bez mrtvih tipki)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danska"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Francuska)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norveška)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Poljska)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Švedska)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonska"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Španska"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finska"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Farska"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francuska"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Francuska"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Grčka (politonska)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Grčka (politonska)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK tastatura"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gruzijska (\"ruski\" raspored)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gruzijska (\"latinični\" raspored)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grčka"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grčka (politonska)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Hrvatska"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Mađarska"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irska"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Izraelska"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Izraelska (fonetska)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranska"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandska"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italijanska"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japanska 106 tipki"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgiška"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korejanska"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdska (arapsko pismo)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latino-Američka"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laoska"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Iranska"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latvijska"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maorska"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonska"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Mjanmarska (Burmanska)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolska (ćirilica)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Malteška (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Malteška (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigerijska"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Holandska"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norveška"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Poljska (QWERTY)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Poljska (QWERTZ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugalska"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadska (Kvebek)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumunska (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumunska (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumunska (QWERTZ)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Ruska"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Ruska (fonetska)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Švedska"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovenačka"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhaleška"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovačka (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovačka (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norveška)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (švedska/finska)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Srpska (ćirilica)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Sirijska"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Sirijska (fonetska)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamilska (ISCII raspored)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamilska (pisaća mašina)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tajlandska (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tajlandska (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tajlandska (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (marokanski raspored) (+latinica/arebica)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonetska) (+latinica/arebica)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadžička"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmenska"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turska (moderni \"Q\" model)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turska (moderni \"Q\" model)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrajinska"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu tastatura"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US tastatura"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US tastatura (međunarodna)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US tastatura (međunarodna)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbečka (ćirilica)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vijetnamska \"red brojeva\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslavenska (latinična)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Desna Alt tipka"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Obje Shift tipke istovremeno"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control i Shift tipka istovremeno"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock tipka"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift i CapsLock tipke istovremeno"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl i Alt tipke istovremeno"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt i Shift tipke istovremeno"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Meni\" tipka"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Lijeva \"Windows\" tipka"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Desna \"Windows\" tipka"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Obje Control tipke istovremeno"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Obje Alt tipke istovremeno"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Lijeva Shift tipka"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Desna Shift tipka"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Lijeva Alt tipka"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Lijeva Control tipka"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Desna Control tipka"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1466,12 +1448,12 @@ msgstr ""
 "izvršiti prebacivanje između raznih rasporeda tastature\n"
 "(npr: latinični i ne-latinični)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1482,257 +1464,227 @@ msgstr ""
 "Tokom instalacije, trebate koristiti desnu Control\n"
 "tipku da prebacujete između raznih rasporeda tastature."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Mouse"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Opšti PS2 Miš sa točkićem"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 dugme"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Opšti miš sa 2 dugmeta"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Opšti miš sa 3 dugmeta sa simulacijom točkića"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Sa točkićem"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serijski"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Opšti miš sa 3 dugmeta"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan sa simulacijom točkića"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series sa simulacijom točkića"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (serijski, stari C7 tip)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (serijski, stari C7 tip) sa simulacijom točkića"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse sa simulacijom točkića"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 dugmeta"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 dugmeta"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 dugmeta sa simulacijom točkića"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Univerzalno"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Bilo koji PS/2 ili USB miš"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox kontroler S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Bez miša"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "nijedan"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Bez miša"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Testiram miša"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Molim izaberite vrstu vašeg miša."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Izbor miša"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emuliraj treće dugme?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Port miša"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Molim izaberite na kojem serijskom portu je spojen vaš miš."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Simulacija dugmeta"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Simulacija dva dugmeta"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Simulacija tri dugmeta"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Molim testirajte miš"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Da aktivirate miša,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "POMJERITE VAŠ TOČKIĆ!"
@@ -1796,6 +1748,52 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francuska"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Poljska"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenska (stara)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Mouse"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Bez miša"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Simulacija dugmeta"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Simulacija dva dugmeta"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Simulacija tri dugmeta"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Turska (tradicionalni \"F\" model)"
 
diff --git a/po/ca.po b/po/ca.po
index 698b292..a71150b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2018-09-02 15:48+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -65,22 +65,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB o més"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Servidor de les X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Trieu un servidor de les X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configuració de capçaleres múltiples"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -89,12 +89,12 @@ msgstr ""
 "El vostre sistema permet l'ús d'una configuració de múltiples capçals.\n"
 "Què voleu fer?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Seleccioneu la mida de la memòria de la vostra targeta gràfica"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -105,7 +105,7 @@ msgstr ""
 "que potser pot admetre característiques addicionals.\n"
 "Vol utilitzar-lo?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -114,75 +114,75 @@ msgstr ""
 "Aquest controlador de propietat no s'ha instal·lat correctament, es torna al "
 "controlador lliure."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configura tots els capçals independentment"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Utilitza l'extensió Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configura només la targeta «%s»%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personalitzada"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Configuració de la targeta gràfica i del monitor"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Surt"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Targeta gràfica"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Resolució"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Prova"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opcions"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Connectors"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "El vostre fitxer de configuració de Xorg no és vàlid, s'ignora."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -195,32 +195,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Trieu un monitor per a la capçalera #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Trieu un monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n'Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Genèric"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Fabricant"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -244,22 +244,22 @@ msgstr ""
 "el podríeu fer malbé.\n"
 "En cas de dubte, sigueu conservador amb aquest paràmetre."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Velocitat de refresc horitzontal"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Velocitat de refresc vertical"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Trieu els connectors"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -284,7 +284,7 @@ msgstr ""
 "del servidor gràfic» al centre de control de Mageia i torneu a seleccionar "
 "la vostra targeta gràfica."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -307,83 +307,83 @@ msgstr ""
 "programari» i instal·leu manualment el paquet de microprogramari o bé "
 "reconfigureu la targeta gràfica."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 colors (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32.768 colors (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65.536 colors (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milions de colors (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automàtic"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Resolucions"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Altres"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Trieu la resolució i la profunditat de color"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Targeta gràfica: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "D'acord"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Prova la configuració"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Voleu provar la configuració?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Avís: la prova d'aquesta targeta gràfica pot penjar-vos l'ordinador"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -394,157 +394,162 @@ msgstr ""
 "%s\n"
 "Intenteu canviar alguns paràmetres"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Se sortirà en %d segons"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Aquesta configuració és correcta?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Inhabilita Ctrl-Alt-Retrocés: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "no"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "sí"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Acceleració 3D per maquinari: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposició del teclat: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Disposició del teclat: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipus de ratolí: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Sincronització horitzontal del monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Refresc vertical del monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Targeta gràfica: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memòria gràfica: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Profunditat del color: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolució: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Controlador del Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Configuració del Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Opcions globals"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Inhabilita Ctrl-Alt-Retrocés"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opcions de la targeta gràfica"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Habilita la translucidesa (extensió de Composite) "
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Utilitza un punter de ratolí accelerat per maquinari"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Habilita l'acceleració RENDER (pot causar errors quan es mostra text)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Habilita la pantalla duplicada en el monitor extern"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Habilita la pantalla duplicada en el segon monitor"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Força el mode de visualització de DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Habilita la tecla de drecera del BIOS per canviar al monitor extern"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Utilitza EXA en lloc de XAA (millor rendiment per Render i Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Interfície gràfica a l'inici"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Inicia automàticament la interfície gràfica (Xorg) a l'arrencada"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -565,325 +570,266 @@ msgstr ""
 "\n"
 "Teniu aquesta característica?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Quina norma segueix el vostre televisor?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "altre"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Txec (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Alemany"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Espanyol"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finès"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francès"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Teclat Regne Unit"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Noruec"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polonès"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Rus"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Suec"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Teclat Estats Units"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanès"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armeni (antic)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armeni (màquina d'escriure)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armeni (fonètic)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Àrab"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Asturià"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjanès (llatí)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belga"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalí (disposició Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalí (disposició probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Búlgar (fonètic)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Búlgar (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasiler (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnià"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetà"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Bielorús"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Suís (disposició alemanya)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Suís (disposició francesa)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr ""
-"_: teclat\n"
-"Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Txec (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Txec (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Alemany"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Alemany (sense tecles inoperatives)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danès"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (Estats Units)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Francès)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (Regne Unit)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Noruec)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polonès)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Suec)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonià"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Espanyol"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finès"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Feroès"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr ""
+"_: teclat\n"
+"Francès (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -892,303 +838,324 @@ msgstr ""
 "_: teclat\n"
 "Francès (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr ""
 "_: teclat\n"
 "Francès (Bepo, només llatí-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr ""
+"_: teclat\n"
+"Francès (Bepo, només llatí-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Teclat Regne Unit"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgià (disposició «russa»)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgià (disposició «llatina»)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grec"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grec (politònic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croata"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hongarès"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irlandès"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelià"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelià (fonètic)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranià"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandès"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italià"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japonès de 106 tecles"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirguís"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Coreà"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurd (escriptura aràbiga)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Espanyol sud-americà"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laosià"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Lituà"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Letó"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malaiàlam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedoni"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongol (ciríl·lic)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltès (Regne Unit)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltès (Estats Units)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigerià"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Holandès"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Noruec"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polonès (disposició qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polonès (disposició qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Paixtu"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portuguès"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canadenc (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romanès (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romanès (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1197,126 +1164,133 @@ msgstr ""
 "_: teclat\n"
 "Romanès (bàsic)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Rus"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Rus (fonètic)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Suec"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Eslovè"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Singalès"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Eslovac (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Eslovac (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Noruec)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (suec/finès)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbi (ciríl·lic)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Siri"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Siri (fonètic)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tàmil (disposició ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tàmil (disposició de màquina d'escriure)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1325,7 +1299,7 @@ msgstr ""
 "_: teclat\n"
 "Tifinagh (disposició marroquina) (+llatí/àrab)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1334,21 +1308,21 @@ msgstr ""
 "_: teclat\n"
 "Tifinagh (fonètic) (+llatí/àrab)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadjik"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turcman"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1357,7 +1331,7 @@ msgstr ""
 "_: teclat\n"
 "Turc (model \"F\")"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1366,137 +1340,147 @@ msgstr ""
 "_: teclat\n"
 "Turc (model \"Q\")"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ucraïnès"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdú"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Teclat Estats Units"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Teclat Estats Units (internacional)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Teclat Estats Units (internacional)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (Teclat Estats Units amb 3 nivells per tecla)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbek (ciríl·lic)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita «fila numèrica» QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Iugoslau (llatí)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Tecla d'Alternativa Gràfica"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Simultàniament ambdues tecles de Majúscules"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Simultàniament les tecles Ctrl i Majúscules"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Tecla Bloq Maj"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Simultàniament les tecles Majúscules i Bloq Maj"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Simultàniament les tecles Ctrl i Alt"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Simultàniament les tecles Alt i Majúscules"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "tecla de «Menú»"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Tecla de «Windows» Esquerra"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Tecla de «Windows» Dreta"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Simultàniament ambdues tecles Ctrl"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Simultàniament ambdues tecles Alt"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Tecla Maj Esquerra"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Tecla Maj dreta"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Tecla Alt esquerra"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Tecla esquerra de control"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Tecla Control dret"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1507,12 +1491,12 @@ msgstr ""
 "permetran canviar entre diferents disposicions de teclat\n"
 "(p. ex. llatina i no llatina)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Advertència"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1523,257 +1507,227 @@ msgstr ""
 "Durant la instal·lació haureu de fer servir la tecla Control Dreta\n"
 "per a commutar entre les diverses disposicions de teclat."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Ratolí de Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Estàndard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Ratolí PS2 genèric amb rodeta"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 botó"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Ratolí genèric de 2 botons"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Ratolí genèric de 3 botons amb emulació de rodeta"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rodeta"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "sèrie"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Ratolí genèric de 3 botons"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan amb emulació de rodeta"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series amb emulació de rodeta"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (sèrie, tipus C7 antic)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (sèrie, tipus C7 antic) amb emulació de rodeta"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse amb emulació de rodeta"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 botons"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 botons"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 botons amb emulació de rodeta"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Qualsevol ratolí PS/2 o USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Força evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Ratolí de VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Ratolí de VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "cap"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Cap ratolí"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "S'està provant el ratolí"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Seleccioneu el tipus del vostre ratolí."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Opció de ratolí"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Voleu emular el tercer botó?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Port del ratolí"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Seleccioneu el port sèrie on està connectat el ratolí."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulació dels botons"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulació del botó 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulació del botó 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Proveu el ratolí."
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Per activar el ratolí,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MOVEU LA RODETA!"
@@ -1831,3 +1785,53 @@ msgstr "Executa la configuració de gràfics Mageia"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "Cal autenticació per executar la configuració dels gràfics de Mageia"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francès"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polonès"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armeni (antic)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr ""
+#~ "_: teclat\n"
+#~ "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Ratolí de Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Ratolí de VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Ratolí de VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulació dels botons"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulació del botó 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulació del botó 3"
diff --git a/po/cs.po b/po/cs.po
index d85aff8..8ac6cbe 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-07-01 12:43+0000\n"
 "Last-Translator: fri\n"
 "Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -63,22 +63,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB nebo více"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Zvolte X server"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Nastavení dvou monitorů"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -87,12 +87,12 @@ msgstr ""
 "Váš systém podporuje zobrazení na dvou monitorech.\n"
 "Co chcete dělat?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Vyberte velikost paměti vaší grafické karty"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -103,7 +103,7 @@ msgstr ""
 "podporovat více vlastností.\n"
 "Přejete si jej používat?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -111,75 +111,75 @@ msgid ""
 msgstr ""
 "Proprietární ovladač nebyl řádně nainstalován, použije se otevřený ovladač."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Nastavit všechny monitory nezávisle"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Použít rozšíření Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Nastavit pouze kartu \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Vlastní"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Nastavení grafické karty a monitoru"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Konec"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafická karta"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Zkouška"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Volby"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Moduly"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Váš soubor s nastavením X.org je poškozen, bude se přehlížet."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -192,32 +192,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Zvolte monitor pro výstup č. %d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Zvolte typ monitoru"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Obecný"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Dodavatel"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -242,22 +242,22 @@ msgstr ""
 "jistí,\n"
 "zvolte raději typ s nižšími schopnostmi."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horizontální (řádková) synchronizace"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikální (obrazovková) synchronizace"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Vyberte zásuvné moduly"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -284,7 +284,7 @@ msgstr ""
 "odebrat software\" a změňte ovladač grafické karty tím, že půjdete na "
 "\"Technika \\ Nastavit grafiku\" a znovu zvolte vaši grafickou kartu."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -306,84 +306,84 @@ msgstr ""
 "odebrat software\" a nainstalujte balíček ručně, nebo znovu přenastavte vaši "
 "grafickou kartu."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 barev (8 bitů)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tisíc barev (15 bitů)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tisíc barev (16 bitů)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miliónů barev (24 bitů)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Rozlišení"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Další"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Vyberte si rozlišení a barevnou hloubku"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafická karta: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Nápověda"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Vyzkoušet nastavení"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Chcete si vyzkoušet nastavení?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Varování: Zkouška na této grafické kartě může způsobit zatuhnutí počítače"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -394,157 +394,162 @@ msgstr ""
 "%s\n"
 "Zkuste změnit některé parametry"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Zkouška skončí za %d sekund"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Je toto správné nastavení?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Vypnout Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "Ne"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "Ano"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Hardwarová 3D akcelerace: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Rozložení klávesnice: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Rozložení klávesnice: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Typ myši: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Horizontální frekvence monitoru: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Vertikální frekvence monitoru: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafická karta: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Paměť na gr. kartě: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Barevná hloubka: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rozlišení: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg ovladač: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Nastavení Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Globální volby"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Vypnout Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Volby grafické karty"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Povolit průsvitnost (rozšíření Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Použít hardwarově urychlený ukazatel myši"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Povolit akceleraci RENDER (může způsobit chyby při zobrazování textu)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Povolit dvojí zobrazení na externím monitoru"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Povolit dvojí zobrazení na druhém displeji"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Vynutit režim zobrazení DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Povolit přepínání výstupu na externí monitor klávesami BIOSu"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Použít EXA místo XAA (lepší výkon rozšíření Render a Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Grafické rozhraní při spuštění"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Automaticky spustit grafické rozhraní (Xorg) při startu"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -565,922 +570,899 @@ msgstr ""
 "\n"
 "Má vaše karta tuto vlastnost?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Jakou normu váš televizor používá?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "Jiné"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "České (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Německé"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvořák"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Španělské"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finské"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francouzské"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Britské (UK)"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norské"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polské"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Ruské"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Švédské"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US-Americké"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albánské"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Arménské (staré)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Arménské (psací stroj)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Arménské (foneticky)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabské"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Asturijské"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Ázerbajdžánské (latinka)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgické"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengálské (Inscript styl)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengálské (Probhat styl)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulharské (foneticky)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulharské (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazilské (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosenské"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetské"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Běloruské"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Švýcarské (Německý styl)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Švýcarské (Francouzský styl)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee slabičné"
+"Czech (QWERTZ)"
+msgstr "České (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "České (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Německé"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Německé (bez mrtvých kláves)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dánské"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvořák (US) "
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvořák (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvořák (Francouzské)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvořák (VB)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvořák (Norské)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvořák (Polské)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvořák (Švédské) "
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonské"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Španělské"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finské"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Farské"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francouzské (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Francouzské (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Francouzské (Bepo, jen latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Francouzské (Bepo, jen latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Britské (UK)"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gruzínské (\"Ruské\" rozložení)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gruzínské (rozložení \"Latin\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Řecké"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Řecké (polytonické)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujartské"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmutské"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Chorvatské"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Maďarské"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irské"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitutské"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Izraelské"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Izraelské (foneticky)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Íránské"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandské"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italské"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japonská 106 kláves"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kanadské"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kyrgizská klávesnice"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korejská klávesnice"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdské (arabský skript)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latinsko-Americké"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laoské"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litevské"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Lotyšské"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalamské"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonské"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myamarské (Burnské)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolské (cyrilice)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltézské (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltézské (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigerijské"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Holandské"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norské"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polské (rozložení QWERTY)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polské (rozložení QWERTZ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Paštské"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugalské"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadské (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumunské (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumunské (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumunské (základní)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Ruské"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Ruské (foneticky)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Švédské"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovinské"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhalské"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovenské (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovenské (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Norské)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (švédské/finské)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhské"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Srbské (cyrilika)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syrské"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syrské (foneticky)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamilské (ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamilské (psací stroj)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thajské (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thajské (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thajské (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (marocké rozložení) (+latinka/arabština)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonetické) (+latinka/arabština)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tádžické"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmenské"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turecké (model \"F\")"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turecké (model \"Q\")"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrajinské"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdské"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US-Americké"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US (mezinárodní)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US (mezinárodní)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (US klávesnice s 3 úrovněmi na klávesu)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbecké (cyrilice)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamská \"číselná řada\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslávské (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Pravá klávesa Alt"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Obě klávesy Shift současně"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control a Shift současně"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Klávesa CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Klávesy Shift a CapsLock současně"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Klávesy Ctrl a Alt současně"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt a Shift současně"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Klávesa \"Menu\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Levá klávesa \"Windows\""
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Pravá klávesa \"Windows\""
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Obě klávesy Control současně"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Obě klávesy Alt současně"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Levá klávesa Shift"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Pravá klávesa Shift"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Levá klávesa Alt"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Levá klávesa Control"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Pravá klávesa Control"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1491,12 +1473,12 @@ msgstr ""
 "budete moci přepínat rozložení znaků vaší klávesnice.\n"
 "(např. mezi českým a americkým)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Varování"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1507,257 +1489,227 @@ msgstr ""
 "Během instalace je nutné pro přepnutí mezi různými klávesovými mapami použít "
 "pravý Ctrl."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - myš"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standardní"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Standardní PS2 myš s kolečkem"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 tlačítko"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Standardní dvoutlačítková myš"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Standardní třítlačítková myš s emulací kolečka"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "S kolečkem"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "Sériová"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Standardní třítlačítková myš"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan s emulací kolečka"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech série CC (sériová)"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech série CC (sériová) s emulací kolečka"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (sériová, starý C7 typ)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (sériová, starý C7 typ) s emulací tlačítka"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse s emulací kolečka"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "Busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 tlačítka"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 tlačítka"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 tlačítková s emulací kolečka"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Univerzální"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Libovolná PS/2 & USB myš"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Vynutit evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Myš VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Myš VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "Žádná"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Bez myši"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Zkouší se myš"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Vyberte si, prosím, váš typ myši."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Výběr myši"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emulovat třetí tlačítko?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Připojení myši"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Ke kterému sériovému portu je připojena vaše myš?"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulace tlačítek"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulace 2. tlačítka"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulace 3. tlačítka"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Vyzkoušejte, prosím, funkčnost myši"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Pohybujte kurzorem"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "A TOČTE KOLEČKEM!"
@@ -1815,3 +1767,51 @@ msgstr "Spustit nastavení Mageii pro grafiku"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "Ke spuštění nastavení Mageii pro grafiku je vyžadováno ověření"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvořák"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francouzské"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polské"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Arménské (staré)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee slabičné"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhské"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - myš"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Myš VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Myš VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulace tlačítek"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulace 2. tlačítka"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulace 3. tlačítka"
diff --git a/po/cy.po b/po/cy.po
index e839155..dfa6187 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2015-12-26 16:06+0000\n"
 "Last-Translator: ciaran\n"
 "Language-Team: Welsh (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -64,22 +64,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "16 MB neu fwy"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Gweinydd X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Dewiswch weinydd X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr " ffurfweddiad amlben"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -88,12 +88,12 @@ msgstr ""
 "Mae eich system yn cynnal ffurfweddiad amlben.\n"
 "Beth hoffech ei wneud?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Dewiswch faint cof eich cerdyn graffeg"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -104,7 +104,7 @@ msgstr ""
 "nodweddion pellach.\n"
 "Hoffech chi ei ddefnyddio?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -113,75 +113,75 @@ msgstr ""
 "Nid oedd y gyrrwr perchnogol wedi ei osod yn gywir, newid i'r gyrrwr "
 "meddalwedd rydd."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Ffurfweddu pob pen yn annibynnol"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Defnyddiwch estyniad Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Ffurfweddu cerdyn \"%s\" %s yn unig"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Arddull"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Ffurfweddu Cerdyn Graffig a Monitor"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Cerdyn Graffeg"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Cydraniad"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Prawf"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Ategolion"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Mae eich ffeil ffurfweddu Xorg wedi torri, byddwn yn ei anwybyddu."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -194,32 +194,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Dewiswch fonitor ar gyfer #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Dewiswch fonitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generig"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Gwerthwr"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -242,22 +242,22 @@ msgstr ""
 "hynny.\n"
 "Os oes gennych amheuaeth, dewiswch raddfa is."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Graddfa adfywio lorweddol"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Graddfa adfywio fertigol"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Dewiswch ategynnau"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -281,7 +281,7 @@ msgstr ""
 "gyrrwr graffeg drwy fynd i \"gosod y gweinydd graffigol\" yng nghanolfan "
 "rheoli Mageia ac ailddewis eich cerdyn graffeg."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -301,83 +301,83 @@ msgstr ""
 "rhydd’ y storfa yn y man “gosod a thynnu meddalwedd” a gosod y pecyn "
 "cadarnwedd â llaw neu ailffurfweddu eich cerdyn graffeg."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 lliw (8 did)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil o liwiau (15 did)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil o liwiau (16 did)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miliwn o liwiau (24 did)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Cyfraniadau"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Arall"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Dewiswch y cydraniad a'r dyfnder lliw"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Cerdyn graffeg: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Prawf o'r ffurfweddiad"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Ydych chi eisiau profi'r ffurfweddiad?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Rhybudd: gall profi'r cerdyn graffeg hwn rewi eich cyfrifiadur"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -388,158 +388,163 @@ msgstr ""
 "%s\n"
 "Ceisiwch newid paramedrau"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Gadael mewn %d eiliad"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "A'i hwn yw'r gosodiad cywir?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Analluogi Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "na"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "ie"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Cyflymu caledwedd 3D: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Cynllun allweddell: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Cynllun allweddell: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Math o lygoden: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "HorizSync Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "VertRefresh Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Cerdyn graffeg: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Cof graffeg: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Dyfnder lliw: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Cydraniad: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Gyrrwr Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Ffurfweddiad Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Dewisiadau eang"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Analluogi Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Dewisiadau cerdyn graffig"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Galluogi Tryloywder (estyniad cyfansawdd)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Defnyddiwch pwyntiwr llygoden gyda chaledwedd cyflym"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Galluogi Cyflymu RENDER (gall hyn achosi gwallau wrth ddangos testun)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Galluogi dangos dyblyg ar fonitor allanol"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Galluogi dangos dyblyg ar ail ddangosydd"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Gorfodi modd dangos DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Galluogi bysell boeth BIOS ar gyfer cyfnewid monitor allanol."
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 "Defnyddio EXA yn lle XAA (gwell perfformiad ar gyfer Render a Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Rhyngwyneb graffigol wrth gychwyn"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Cychwyn y rhyngwyneb graffigol (Xorg) X yn awtomatig wrth gychwyn"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -560,134 +565,47 @@ msgstr ""
 "\n"
 "Ydy'r nodwedd hon gennych?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Pa norm mae eich teledu'n ei ddefnyddio?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "arall"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tsiec (QWERTY)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Almaenaidd"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Sbaenaidd"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Ffinnaidd"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Ffrengig"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Bysellfwrdd DG"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norwyaidd"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Pwylaidd"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Rwsiaidd"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Swedaidd"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Bysellfwrdd UDA"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albaniaidd"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenaidd (hen)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenaidd (teipiadur)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenaidd (ffonetig)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabaidd"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -696,644 +614,698 @@ msgstr ""
 "_: bysellfwrdd\n"
 "Astwrieg"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjan (lladin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgaidd"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalaidd (gosodiad Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalaidd (gosodiad Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bwlgaraidd (ffonetig)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bwlgaraidd (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasilaidd (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosniaidd"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetaidd"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarusaidd"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Swisaidd (gosodiad Almaeneg)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Swisaidd (gosodiad Ffrengig)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "sillafog Cherokee"
+"Czech (QWERTZ)"
+msgstr "Tsiec (QWERTY)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tsiec (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Almaenaidd"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Almaenaidd (dim bysellau marw)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danaidd"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (UDA)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Ffrengig)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (DG)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norwyaidd)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Pwylaidd)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Swedaidd)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonaidd"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Sbaenaidd"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Ffinnaidd"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Ffaroaidd"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Ffrengig"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Ffrengig"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Groegaidd (polytonic)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Groegaidd (polytonic)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Bysellfwrdd DG"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgaidd (gosodiad \"Rwsiaidd\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgaidd (gosodiad \"Lladinaidd\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Groegaidd"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Groegaidd (polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croataidd"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hwngaraidd"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Gwyddelig"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelaidd"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelaidd (Ffonetig)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranaidd"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Eislandaidd"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Eidalaidd"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Siapaëaidd 106 bysell"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Bysellfwrdd Kyrgyz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Bysellfwrdd Corëaidd"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Cwrdaidd (sgript arabaidd)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Lladin America"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotiaidd"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Lithwanaidd"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latfiaidd"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalamaidd"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedonaidd"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burma)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolaidd (cyrillic)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltaidd (DU)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltaidd (UDA)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeraidd"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Isalmaenaidd"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norwyaidd"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Pwylaidd (gosodiad qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Pwylaidd (gosodiad qwerty)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Patsho"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portiwgalaidd"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canada (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romanaidd (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romanaidd (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Romanaidd (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Rwsiaidd"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Rwsiaidd (Ffonetig)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Swedaidd"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slfenaidd"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slofacaidd (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slofacaidd (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norwyaidd)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (Swedaidd/Ffinaidd)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbaidd (cyrilig)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syriaidd"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syriaidd (ffonetig)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (cynllun TSCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (cynllun teipiadur)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (cynllun moroccot) (+lladin/arabeg)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (phonetig) (+lladin/arabeg)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Bysellfwrdd Tajig"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmen"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1342,7 +1314,7 @@ msgstr ""
 "_: bysellfwrdd\n"
 "Twrceg (model \"F\")"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1351,137 +1323,147 @@ msgstr ""
 "_: bysellfwrdd\n"
 "Twrceg (model \"Q\")"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Wcranaidd"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "bysellfwrdd Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Bysellfwrdd UDA"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Bysellfwrdd UDA (rhyngwladol)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Bysellfwrdd UDA (rhyngwladol)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (Bysellfwrdd UDA gyda 3 lefel i bob bysell)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbekaidd (Cyrilig)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Fietnamëaidd \"rhes rhifol\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Iwgoslafaidd (lladin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Bysell Alt dde"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Y ddwy fysell Shift gyda'i gilydd"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Bysellau Control a Shift gyda'i gilydd"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Bysell CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Bysellau Shift ac CapsLock gyda'i gilydd"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Bysellau Ctrl ac Alt gyda'i gilydd"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Bysellau Alt a Shift  gyda'i gilydd"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Bysell \"Dewislen\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Bysell \"Windows\" chwith"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Bysell \"Windows\" de"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Y ddwy fysell Control gyda'i gilydd"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Y ddwy fysell Alt gyda'i gilydd"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Bysell Shift chwith"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Bysell Alt dde"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Bysell Alt chwith"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Bysell Control chwith"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Bysell Control dde"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1492,12 +1474,12 @@ msgstr ""
 "caniatáu newid rhwng bysellfyrddau gwahanol (e.e.: lladin neu\n"
 "arall)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1508,257 +1490,227 @@ msgstr ""
 "Yn ystod y gosod, bydd angen i chi ddefnyddio'r fysell\n"
 "Crtl de i newid rhwng bysellfyrddau cynllun gwahanol."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Llygoden - Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Safonol"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Llygoden Olwyn PS Generig"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 botwm"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Llygoden 2 Fotwm Generig"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Llygoden 3 Botwm Generig gydag efelychiad Olwyn"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Olwyn"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "cyfresol"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Llygoden 3 Botwm Generig"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan gydag efelychiad Olwyn"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Systemau  Llygoden"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series gydag efelychiad Olwyn"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Llygoden Logitech (cyfresol, hen fath C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Llygoden Logitech (cyfresol, hen fath C7) gydag efelychiad Olwyn"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse gydag efelychiad Olwyn"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 fotwm"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 botwm"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 botwm gydag efelychiad Olwyn"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Cyffredinol"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Unrhyw lygoden PS/2 ac USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Gorfodi evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Llygoden VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Llygoden VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "dim"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Dim llygoden"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Profi'r llygoden"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Dewiswch fath eich llygoden."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Dewis llygoden"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Efelychu'r trydydd botwm?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Porth Llygoden"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Dewiswch ba  borth cyfresol mae eich llygoden wedi cysylltu iddi."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Efelychiad botymau"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Efelychiad Botwm 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Efelychiad Botwm 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Profwch y llygoden"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "I ysgogi'r llygoden,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "SYMUDWCH YR OLWYN!"
@@ -1816,3 +1768,51 @@ msgstr "Rhedeg rhaglen ffurfweddu graffeg Mageia"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "Rhaid awdurdodi i redeg rhaglen ffurfweddu graffeg Mageia"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Ffrengig"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Pwylaidd"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenaidd (hen)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "sillafog Cherokee"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Llygoden - Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Llygoden VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Llygoden VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Efelychiad botymau"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Efelychiad Botwm 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Efelychiad Botwm 3"
diff --git a/po/da.po b/po/da.po
index d881267..bf8def3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2017-04-16 19:17+0000\n"
 "Last-Translator: scootergrisen\n"
 "Language-Team: Danish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -65,22 +65,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB eller mere"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X-server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Vælg en X-server"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Flerskærms-konfiguration"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -89,12 +89,12 @@ msgstr ""
 "Dit system understøtter konfiguration af flere skærme\n"
 "Hvad vil du gøre?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Vælg hukommelsesmængde for dit grafikkort"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -105,7 +105,7 @@ msgstr ""
 "understøtter yderligere faciliteter.\n"
 "Vil du bruge den?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -114,75 +114,75 @@ msgstr ""
 "Den proprietære driver blev ikke installeret rigtigt, falder tilbage til den "
 "frie programmel-driver."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Konfigurér alle skærme uafhængigt"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Brug Xinerama-udvidelse"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Konfigurér kun kort \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Tilpasset"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Konfiguration af grafikkort og skærm"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Afslut"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafikkort"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Skærm"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Opløsning"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Afprøv"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Valg"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Din Xorg-konfigurationsfil er i stykker, vi vil ignorere den."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -195,32 +195,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Vælg en skærmtype for hoved nummer %d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Vælg en skærmtype"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Standard"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Producent"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -245,22 +245,22 @@ msgstr ""
 "Hvis du er i tvivl, bør du vælge en opsætning, som du med SIKKERHED ved\n"
 "at din skærm kan klare."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Vandret opdateringsfrekvens"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Lodret opdateringsfrekvens"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Vælg programmoduler"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -284,7 +284,7 @@ msgstr ""
 "grafikdriver ved at gå til \"Opsætning af grafiske server\" på Mageia "
 "Kontrol Center og re-vælge dit grafikkort."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -304,84 +304,84 @@ msgstr ""
 "'nonfree' arkiv \"Installer og fjern software\" og installer firmware pakken "
 "manuelt eller omkonfigurer dit grafikkort."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 farver (8 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tusinde farver (15 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tusinde farver (16 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 millioner (24 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Opløsninger"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Andet"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Vælg opløsning og farvedybde"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafikkort: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Annullér"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Hjælp"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Test konfigurationen"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Ønsker du at afprøve konfigurationen?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Advarsel: afprøvning af dette grafikkort kan få din maskine til at fryse"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -392,159 +392,164 @@ msgstr ""
 "%s\n"
 "Prøv at ændre nogen parametre"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Forsvinder om %d sekunder"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Er dette den korrekte indstilling?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Deaktivér Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "nej"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "ja"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D hardwareacceleration: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastatur-type: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tastatur-type: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Muse-type: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Skærm: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Skærms vandrette frekvens: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Skærms lodrette frekvens: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafikkort: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafik-hukommelse: %s kb\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Farvedybde: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Opløsninger %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg driver: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg konfiguration"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Overordnede valgmuligheder"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Deaktivér Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Valgmuligheder for grafikkort"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Aktivér gennemsigtighed (sammensat udvidelse)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Brug hardwareaccelereret musemarkør"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Aktivér fremvisnings-accelleration (dette vil måske bevirke fejl ved visning "
 "af tekst)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Aktivér duplikeret skærmbillede på ekstern skærm"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Aktiv+er duplikeret skærmbillede på skærm nummer 2"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Sæt skærmtilstand til DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Aktivér BIOS-hurtigtaster for skift af ekstern skærm"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Brug EXA i stedet for XAA (bedre ydelse for Render og Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Start X ved systemstart"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Automatisk start af den grafiske grænseflade (Xorg) ved opstart"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -565,134 +570,47 @@ msgstr ""
 "\n"
 "Har du denne funktion?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Hvilken standard bruger dit tv?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "andet"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tjekkisk (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Tysk"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spansk"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finsk"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Fransk"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Britisk"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norsk"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polsk"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Russisk"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Svensk"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Amerikansk"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albansk"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armensk (gammel)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armensk (skrivemaskine)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armensk (fonetisk)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabisk"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -701,644 +619,698 @@ msgstr ""
 "_: tastatur\n"
 "Asturisk"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidiansk (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgisk"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (Inscript-layout)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgarsk (fonetisk)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgarsk (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasiliansk (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnisk"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/tibetansk"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Hviderussisk"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Schweizisk (Tysk-layout)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Schweizisk (Fransk-layout)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabic"
+"Czech (QWERTZ)"
+msgstr "Tjekkisk (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tjekkisk (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Tysk"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Tysk (ingen døde taster)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dansk"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (fransk)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (norsk)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (polsk)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (svensk)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estisk"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spansk"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finsk"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Færøsk"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Fransk (bépo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Fransk (bépo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Fransk (bépo, kun latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Fransk (bépo, kun latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Britisk"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgisk (\"Russisk\"-layout)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgisk (\"Latinsk\"-layout)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Græsk"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Græsk (polytonisk)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroatisk"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungarsk"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irsk"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelsk"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelsk (Fonetisk)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iransk"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandsk"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italiensk"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japansk 106 taster"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kyrgyz tastatur"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Koreansk tastatur"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdisk (arabisk skript)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latinamerikansk"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotisk"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litauisk"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Lettisk"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonisk"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmesisk)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolsk (kyrillisk)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltesisk (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltesisk (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeriansk"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Hollandsk"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norsk"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polsk (qwerty-layout)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polsk (qwertz-layout)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugisisk"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canadisk (Québec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumænsk (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumænsk (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumænsk (grundlæggende)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Russisk"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Russisk (Fonetisk)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Svensk"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovensk"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakisk (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakisk (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Samisk (norsk)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Samisk (svensk/finsk)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbisk (kyrillisk)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syrisk"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syrisk (fonetisk)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII-layout)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (Skrivemaskine-layout)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thailandsk (kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thailandsk (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thailandsk (pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (morokkisk type) (+latinsk/arabisk)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonetisk) (+latinsk/arabisk)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajik tastatur"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmen"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1347,7 +1319,7 @@ msgstr ""
 "_: tastatur\n"
 "Tyrkisk (\"F\"-model)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1356,137 +1328,147 @@ msgstr ""
 "_: tastatur\n"
 "Tyrkisk  (\"Q\"-model)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainsk"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu-tastatur"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Amerikansk"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Amerikansk (internaltionalt)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Amerikansk (internaltionalt)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (USA-tastatur med 3 niveauer per tast)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbek (kyrillisk)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamesisk \"talrække\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslavisk (latinsk)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Højre alt-tast"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Begge taster samtidigt"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Kontrol- og skiftetaster samtidigt"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock-tast"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift- og Capslock-taster samtidigt"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl- og alt-taster samtidigt"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt og Shift-taster samtidigt"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "'Menu'-tast"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Venstre Windows-tast"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Højre Windows-tast"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Begge kontrol-taster samtidigt"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Begge Alt-taster samtidigt"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Venstre skifte-tast"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Højre skifte-tast"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Venstre Alt-tast"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Venstre kontol-tast"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Højre kontrol-tast"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1497,12 +1479,12 @@ msgstr ""
 "lader dig skifte mellem forskellige tastaturlayouter\n"
 "(dvs latinsk eller ikke-latinsk)."
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1513,257 +1495,227 @@ msgstr ""
 "Under installationen skal du bruge den højre Ctrl-tast\n"
 "for at skifte mellem de forskellige tastaturudlægninger."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun-mus"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Standard PS2 mus med hjul"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking-mus"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 knap"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Standard 2-knaps mus"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Standard 3-knaps mus med hjul-emulering"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Hjul"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seriel"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Standard 3-knaps mus"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan med hjul-emulering"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Serien (seriel)"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Serien med hjul-emulering"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Serien"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech mus (seriel, gammel C7 type)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech mus (seriel, gammel C7 type) med hjul-emulering"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking-mus med hjul-emulering"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "Busmus"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 knapper"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 knapper"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 knapper med hjul-emulering"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universiel"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Alle PS/2- og USB-mus"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Gennemtving evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox-Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox mus"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware-mus"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ingen"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Ingen mus"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Tester musen"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Vælg typen på din mus."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Valg af mus"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emulering af tredje knap?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Muse-port"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Vælg hvilken seriel port din mus er forbundet til."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulering af knapper"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulering af knap 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulering af knap 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Test musen"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "For at aktivere musen,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "FLYT PÅ HJULET!"
@@ -1821,3 +1773,51 @@ msgstr "Kør Mageia Grafik konfiguration"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "Godkendelse er påkrævet for at køre Mageia Grafik konfiguration"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Fransk"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polsk"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armensk (gammel)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabic"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun-mus"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox mus"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware-mus"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulering af knapper"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulering af knap 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulering af knap 3"
diff --git a/po/de.po b/po/de.po
index 4198345..1a314e4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2017-06-03 13:48+0000\n"
 "Last-Translator: psyca\n"
 "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -64,22 +64,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB oder mehr"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X-Server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Wählen Sie einen X-Server"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-Monitor-Konfiguration"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -88,12 +88,12 @@ msgstr ""
 "Ihr System unterstützt die gleichzeitige Verwendung mehrerer Monitore.\n"
 "Was wollen Sie machen?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Wählen Sie die Speichergröße Ihrer Grafikkarte"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -104,7 +104,7 @@ msgstr ""
 "zusätzliche Funktionen enthält.\n"
 "Wollen Sie diesen verwenden?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -113,75 +113,75 @@ msgstr ""
 "Der proprietäre Treiber wurde nicht installiert, standardmäßig wird der "
 "freie Treiber verwendet."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Alle Monitore getrennt konfigurieren"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama-Erweiterung verwenden"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Nur Karte „%s“ (%s) konfigurieren"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Grafikkarten & Monitor Einstellungen"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Verlassen"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafikkarte"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Auflösung"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Optionen"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Ihre Xorg-Konfigurationsdatei ist defekt und wird ignoriert."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -194,32 +194,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Wählen Sie Ihren Monitor #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Wählen Sie Ihren Monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n'Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generisch"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Hersteller"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -241,22 +241,22 @@ msgstr ""
 "könnten. Im Zweifelsfall wählen Sie bitte eine konservativere \n"
 "Einstellung."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horizontale Wiederholfrequenz"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikale Wiederholfrequenz"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Wählen Sie die Plugins"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -282,7 +282,7 @@ msgstr ""
 "den Grafiktreiber erneut, indem Sie „Grafischen Server einrichten“ im Mageia-"
 "Kontrollzentrum aufrufen und ihre Grafikkarte erneut auswählen."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -303,83 +303,83 @@ msgstr ""
 "Sie die „nonfree“-Paketquellen in der Paketverwaltung und installieren Sie "
 "das Firmware-Paket manuell oder rekonfigurieren Sie Ihre Grafikkarte."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 Farben (8-Bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32.000 Farben (15-Bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65.000 Farben (16-Bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 Millionen Farben (24-Bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Auflösungen"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Andere"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Wählen Sie bitte Auflösung und Farbtiefe"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafikkarte: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Hilfe"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Testen der Einstellungen"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Möchten Sie die vorgenommenen Einstellungen testen?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Warnung: Testen dieser Grafikkarte kann Ihren Rechner anhalten"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -390,160 +390,165 @@ msgstr ""
 "%s\n"
 "Versuchen Sie, Parameter zu verändern."
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Abbruch in %d Sekunden"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Ist dies die richtige Einstellung?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "<STRG>-<Alt>-Rücktaste deaktivieren: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "Nein"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "Ja"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D-Hardware-Beschleunigung: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastaturlayout: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tastaturlayout: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Maustyp: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor Horiz. Frequenz: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor Vert. Frequenz: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafikkarte: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafikkartenspeicher: %s KB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Farbtiefe: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Auflösung: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg-Treiber: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg konfigurieren"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Globale Einstellungen"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "<Strg>-<Alt>-Rücktaste deaktivieren"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Grafikkarten Optionen"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Aktiviere Translucency (Composite-Erweiterung)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Verwende Mauszeiger-Beschleunigung"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Aktiviere RENDER-Beschleunigung (dies kann zu Fehlern in der Textdarstellung "
 "führen)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Aktivieren des geklonten Bildes für den externen Monitor"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Aktiviere geklontes Bild auf dem zweiten Display"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Anzeige-Modus von DVI erzwingen"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Aktiviere Bootmeldungen für den externen Monitor"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 "Verwende EXA anstelle von XAA (bessere Performance für Render und Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Grafikumgebung zur Startzeit"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Automatisch beim Start in den Grafik-Modus (Xorg) wechseln"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -564,512 +569,465 @@ msgstr ""
 "\n"
 "Haben Sie einen solchen Ausgang und wollen Sie ihn verwenden?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Um welche Fernsehnorm handelt es sich?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "andere"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tschechisch (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Deutsch"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spanisch"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finnisch"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Französisch"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Großbritannien"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norwegisch"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polnisch"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Russisch"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Schwedisch"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US Tastatur"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanisch"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenisch (alt)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenisch (Schreibmaschine)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenisch (Phonetisch)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabisch"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Asturisch"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Aserbaidschanisch (Lateinisches Layout)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgisch"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalisch (Inscript Layout)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalisch (Probhat Layout)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgarisch (Phonetisch)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgarisch (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasilisch (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnisch"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetanisch"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Weißrussisch"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Schweiz (deutsches Layout)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Schweiz (französisches Layout)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Tschechisch (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tschechisch (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Deutsch"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Deutsch (ohne Akzenttasten)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dänemark"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (USA)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Französisch)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (GB)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norwegen)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polnisch)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Schweden)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estland"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spanisch"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finnisch"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Färöisch"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Französisch (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Französisch (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Französisch (Bepo, nur latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Französisch (Bepo, nur latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Großbritannien"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgien (Kyrillisches Layout)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgien (Lateinisches Layout)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Griechisch"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Griechisch (polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Indisch (Gujarati)"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Indisch (Gurmukhi)"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroatisch"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungarisch"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irisch"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Grönländisch (Inuktitut)"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelisch"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelisch (Phonetisch)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranisch"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Isländisch"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italienisch"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japanisch (106 Tasten)"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Indisch (Kannada)"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgisisch"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Koreanisch"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdisch (arabische Schrift)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Lateinamerikanisch"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotisch"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litauisch"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Lettisch"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1078,42 +1036,42 @@ msgstr ""
 "_: Tastatur\n"
 "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Mazedonisch"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmesien)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolisch (Kyrillisches Layout)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltesisch (GB)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltesisch (USA)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1122,368 +1080,392 @@ msgstr ""
 "_: Tastatur\n"
 "Nigerian"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Niederländisch"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norwegisch"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Orissa"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polnisch (QWERTY Layout)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polnisch (QWERTZ Layout)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadisch (Québec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumänisch (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumänisch (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumänisch (basic)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Russisch"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Russisch (Phonetisch)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Schwedisch"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slowenisch"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Singhalesisch (Sinhala)"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slowakisch (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slowakisch (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Samisch (Norwegen)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Samisch (schwedisch/finnisch)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbisch (Kyrillisches Layout)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syrisch"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syrisch (Phonetisch)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamilisch (TSCII Layout)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamilisch (Schreibmaschine)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thailändisch (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thailändisch (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thailändisch (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (marokkanische Anordnung) (+latein/arabisch)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (phonetisch) (+latein/arabisch)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadschikistan"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmenisch"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Türkisch (\"F\" Modell)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Türkisch (\"Q\" Modell)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainisch"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US Tastatur"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Vereinigte Staaten von Amerika (international)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Vereinigte Staaten von Amerika (international)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (US Tastatur mit 3 Funktionen pro Taste)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Usbekisch (Kyrillisches Layout)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamesisch QWERTY („number row“)"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslawisch (Lateinisches Layout)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "<AltGr>-Taste"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Beide Umschalttasten gleichzeitig"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "<Strg>- und Umschalttaste gleichzeitig"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Umschalt-Feststell-Taste"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Umschalt- und Umschalt-Feststell-Taste  gleichzeitig"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "<Strg>- und <Alt>-Taste gleichzeitig"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "<Alt>- und Umschalttaste gleichzeitig"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Menütaste"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Linke „Windows“-Taste"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Rechte „Windows“-Taste"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Beide <Strg>-Tasten gleichzeitig"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Beide <Alt>-Tasten gleichzeitig"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Linke Umschalt-Taste"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Rechte Umschalt-Taste"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Linke <Alt>-Taste"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Linke <Strg>-Taste"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Rechte <Strg>-Taste"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1494,12 +1476,12 @@ msgstr ""
 "mit der Sie zwischen verschiedenen Tastaturbelegungen \n"
 "umschalten können, etwa zwischen deutschem und US-Layout."
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1510,257 +1492,227 @@ msgstr ""
 "Während der Installation, benutzen Sie die rechte <Strg>-Taste,\n"
 "um zwischen den verschiedenen Tastatur Layouts zu wechseln."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Maus"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MausMan/FirstMaus (Seriell)"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Generische PS2-Rad-Maus"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Maus"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMaus"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 Taste"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Generische 2-Tasten-Maus"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Generische 3-Tasten-Maus mit Mausrad-Emulation"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rad"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "Seriell"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Generische 3-Tasten-Maus"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMaus"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan mit Mausrad-Emulation"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Maus-Systeme"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Serie"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Serie mit Mausrad-Emulation"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Serie"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Maus (Seriell, alter C7 Typ)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Maus (Seriell, alter C7 Typ) mit Mausrad-Emulation"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Maus mit Mausrad-Emulation"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "Bus-Maus"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 Tasten"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 Tasten"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 Tasten mit Mausrad-Emulation"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universell"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Einige PS/2- & USB-Mäuse"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "evdev erzwingen"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox Maus"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware Maus"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "keine"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Keine Maus"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Testen der Maus"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Bitte wählen Sie Ihren Maus-Typ."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Maus-Auswahl"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Die dritte Maustaste emulieren?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Maus-Port"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Bitte wählen Sie den seriellen Anschluss, an dem Ihre Maus hängt."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Tasten-Emulation"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "2-Tasten-Emulation"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3-Tasten-Emulation"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Bitte testen Sie Ihre Maus"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Um Ihre Maus zu aktivieren,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "BEWEGEN SIE IHR MAUS-RAD!"
@@ -1823,3 +1775,51 @@ msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 "Authentifizierung wird benötigt, um die Mageia Grafik-Konfiguration "
 "auszuführen"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Französisch"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polnisch"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenisch (alt)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Maus"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox Maus"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware Maus"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Tasten-Emulation"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "2-Tasten-Emulation"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3-Tasten-Emulation"
diff --git a/po/drakx-kbd-mouse-x11.pot b/po/drakx-kbd-mouse-x11.pot
index 217f1a5..2514403 100644
--- a/po/drakx-kbd-mouse-x11.pot
+++ b/po/drakx-kbd-mouse-x11.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\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"
@@ -60,113 +60,113 @@ msgstr ""
 msgid "64 MB or more"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may support additional features.\n"
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid "The proprietary driver was not properly installed, defaulting to free software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93 ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94 ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -175,32 +175,32 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the rate\n"
@@ -212,22 +212,22 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr ""
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware package '%s' to be installed, but it was not available on the enabled media.\n"
@@ -237,7 +237,7 @@ msgid ""
 "To enable full graphics support later, enable the 'nonfree' repository section at \"Install and remove software\" and reconfigure the graphics driver by going to \"Set up the graphical server\" at Mageia Control Center and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware package '%s' to be installed in order for all features (including 3D acceleration) to work properly, but that package was not available in the enabled media.\n"
@@ -245,82 +245,82 @@ msgid ""
 "To enable all graphics card features later, enable the 'nonfree' repository section at \"Install and remove software\" and install the firmware package manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51 ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52 ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -328,157 +328,162 @@ msgid ""
 "Try to change some parameters"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
 #, c-format
-msgid "Mouse type: %s\n"
+msgid "Keyboard variant: %s\n"
 msgstr ""
 
 #: ../lib/Xconfig/various.pm:31
 #, c-format
+msgid "Mouse type: %s\n"
+msgstr ""
+
+#: ../lib/Xconfig/various.pm:33
+#, c-format
 msgid "Monitor: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -490,922 +495,899 @@ msgid ""
 "Do you have this feature?"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Czech (QWERTZ)"
+"Albanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
-"German"
+"Armenian (typewriter)"
 msgstr ""
 
-#: ../lib/keyboard.pm:189
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dvorak"
+"Armenian (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Spanish"
+"Arabic"
 msgstr ""
 
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Finnish"
+"Asturian"
 msgstr ""
 
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
-"French"
+"Azerbaidjani (latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
+#: ../lib/keyboard.pm:192
 #, c-format
-msgid "UK keyboard"
+msgid ""
+"_: keyboard\n"
+"Belgian"
 msgstr ""
 
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Norwegian"
+"Bengali (Inscript-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:195
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Polish"
+"Bengali (Probhat)"
 msgstr ""
 
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Russian"
+"Bulgarian (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Swedish"
+"Bulgarian (BDS)"
 msgstr ""
 
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
+#: ../lib/keyboard.pm:197
 #, c-format
-msgid "US keyboard"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr ""
 
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Albanian"
+"Bosnian"
 msgstr ""
 
-#: ../lib/keyboard.pm:201
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Armenian (old)"
+"Dzongkha/Tibetan"
 msgstr ""
 
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Armenian (typewriter)"
+"Belarusian"
 msgstr ""
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Armenian (phonetic)"
+"Swiss (German layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Arabic"
+"Swiss (French layout)"
 msgstr ""
 
 #: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Asturian"
+"Czech (QWERTZ)"
 msgstr ""
 
 #: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Azerbaidjani (latin)"
+"Czech (QWERTY)"
 msgstr ""
 
 #: ../lib/keyboard.pm:207
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Belgian"
+"German"
 msgstr ""
 
 #: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bengali (Inscript-layout)"
+"German (no dead keys)"
 msgstr ""
 
 #: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bengali (Probhat)"
+"Devanagari"
 msgstr ""
 
 #: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bulgarian (phonetic)"
+"Danish"
 msgstr ""
 
 #: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bulgarian (BDS)"
+"Dvorak (US)"
 msgstr ""
 
 #: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Brazilian (ABNT-2)"
+"Dvorak (Esperanto)"
 msgstr ""
 
 #: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bosnian"
+"Dvorak (French)"
 msgstr ""
 
 #: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dzongkha/Tibetan"
+"Dvorak (UK)"
 msgstr ""
 
 #: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Belarusian"
+"Dvorak (Norwegian)"
 msgstr ""
 
 #: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Swiss (German layout)"
+"Dvorak (Polish)"
 msgstr ""
 
 #: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Swiss (French layout)"
-msgstr ""
-
-#: ../lib/keyboard.pm:219
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Cherokee syllabics"
-msgstr ""
-
-#: ../lib/keyboard.pm:221
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTY)"
-msgstr ""
-
-#: ../lib/keyboard.pm:223
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German (no dead keys)"
-msgstr ""
-
-#: ../lib/keyboard.pm:224
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Devanagari"
-msgstr ""
-
-#: ../lib/keyboard.pm:225
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Danish"
-msgstr ""
-
-#: ../lib/keyboard.pm:226
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak (US)"
-msgstr ""
-
-#: ../lib/keyboard.pm:227
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak (Esperanto)"
+"Dvorak (Swedish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dvorak (French)"
+"Estonian"
 msgstr ""
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:219
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dvorak (UK)"
+"Spanish"
 msgstr ""
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:220
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dvorak (Norwegian)"
+"Finnish"
 msgstr ""
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dvorak (Polish)"
+"Faroese"
 msgstr ""
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:222
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dvorak (Swedish)"
+"French (Azerty standard)"
 msgstr ""
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Estonian"
+"French (Bepo)"
 msgstr ""
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:224
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Faroese"
+"French (Bepo latin9)"
 msgstr ""
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:225
 #, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo)"
+"French (Azerty latin9)"
 msgstr ""
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:226
 #, c-format
-msgid ""
-"_: keyboard\n"
-"French (Bepo, only latin-9)"
+msgid "UK keyboard"
 msgstr ""
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr ""
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr ""
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr ""
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr ""
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr ""
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr ""
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr ""
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr ""
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr ""
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr ""
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr ""
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr ""
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr ""
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr ""
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr ""
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr ""
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr ""
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr ""
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr ""
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr ""
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr ""
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr ""
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr ""
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr ""
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr ""
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr ""
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr ""
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr ""
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr ""
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr ""
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr ""
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr ""
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr ""
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr ""
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr ""
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr ""
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr ""
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr ""
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr ""
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr ""
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr ""
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr ""
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr ""
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr ""
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr ""
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr ""
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr ""
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr ""
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr ""
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, c-format
+msgid "US keyboard (Macintosh)"
+msgstr ""
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr ""
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr ""
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr ""
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr ""
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1413,12 +1395,12 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr ""
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1426,257 +1408,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr ""
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr ""
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr ""
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr ""
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr ""
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr ""
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr ""
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr ""
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr ""
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr ""
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr ""
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr ""
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr ""
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr ""
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr ""
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr ""
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr ""
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr ""
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr ""
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr ""
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr ""
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr ""
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr ""
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr ""
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr ""
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr ""
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr ""
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr ""
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr ""
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index e4410ff..6058015 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-07-02 08:02+0200\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
 "Language-Team: Greek <i18n-el@ml.mageia.org>\n"
@@ -65,22 +65,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB ή περισσότερα"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "εξυπηρετητής X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Επιλέξτε έναν εξυπηρετητή Χ"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Ρύθμιση πολλαπλών οθονών"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -89,12 +89,12 @@ msgstr ""
 "Το σύστημά σας υποστηρίζει τη ρύθμιση πολλαπλών οθονών.\n"
 "Τι θα θέλατε να κάνετε;"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Επιλέξτε το μέγεθος της μνήμης της κάρτας γραφικών σας"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -105,7 +105,7 @@ msgstr ""
 "μπορεί να υποστηρίζει επιπλέον χαρακτηριστικά.\n"
 "Θέλετε να τον χρησιμοποιήσετε;"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -114,76 +114,76 @@ msgstr ""
 "Ο ιδιόκτητος οδηγός δεν εγκαταστάθηκε σωστά, θα χρησιμοποιηθεί ο "
 "προκαθορισμένος ελεύθερος οδηγός."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Ανεξάρτητη ρύθμιση όλων των οθονών"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Χρήση της επέκτασης Xinerama για απεικόνιση σε περισσότερες οθόνες"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Ρύθμιση μόνο της κάρτας «%s» %s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Προσαρμοσμένο"
 
 # Απαλοιφή τόνου, μετατρέπεται αυτόματα σε κεφαλαία #5755.
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "ΡΥΘΜΙΣΗ ΤΗΣ ΚΑΡΤΑΣ ΓΡΑΦΙΚΩΝ & ΤΗΣ ΟΘΟΝΗΣ"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Κάρτα γραφικών"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Οθόνη"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Ανάλυση"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Δοκιμή"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Επιλογές"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Πρόσθετα"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Το αρχείο ρυθμίσεων του Xorg είναι ελαττωματικό. Θα το αγνοήσουμε."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -196,32 +196,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Επιλέξτε μία οθόνη για την οθόνη #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Επιλέξτε οθόνη"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Άμεσης τοποθέτησης και λειτουργίας"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Γενικού τύπου"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Κατασκευαστής"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -249,22 +249,22 @@ msgstr ""
 "ρύθμιση αλλά\n"
 "χωρίς ρίσκο καταστροφής της οθόνης σας."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Συχνότητα οριζόντιας ανανέωσης"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Συχνότητα κατακόρυφης ανανέωσης"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Επέλεξε πρόσθετα"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -291,7 +291,7 @@ msgstr ""
 "γραφικών από το μενού «Ρυθμίστε τον εξυπηρετητή γραφικών» από το Κέντρο "
 "Ελέγχου Mageia και επιλέξτε εκ νέου την κάρτα γραφικών σας."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -314,85 +314,85 @@ msgstr ""
 "firmware χειροκίνητα ή διαμορφώστε εκ νέου την κάρτα γραφικών σας από το "
 "μενού «Ρυθμίστε τον εξυπηρετητή γραφικών» στο Κέντρο Ελέγχου Mageia."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 χρώματα (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 χιλιάδες χρώματα (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 χιλιάδες χρώματα (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 εκατομμύρια χρώματα (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Αυτόματο"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Αναλύσεις"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Άλλο"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Επιλέξτε την ανάλυση και το βάθος χρώματος"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Κάρτα γραφικών: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Εντάξει"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Δοκιμή ρυθμίσεων"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Θέλετε να δοκιμάσετε τις ρυθμίσεις;"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Προσοχή: Η δοκιμή σε αυτή την κάρτα γραφικών μπορεί να παγώσει τον "
 "υπολογιστή σας"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -403,164 +403,169 @@ msgstr ""
 "%s\n"
 "Δοκιμάστε να αλλάξετε μερικές παραμέτρους"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Έξοδος σε %d δευτερόλεπτα"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Είναι σωστή η ρύθμιση;"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Απενεργοποίηση του Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "όχι"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "ναι"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Επιτάχυνση 3D της συσκευής: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Διάταξη πληκτρολογίου: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Διάταξη πληκτρολογίου: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Τύπος ποντικιού: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Οθόνη: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Συχνότητα οριζόντιας ανανέωσης οθόνης: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Συχνότητα κατακόρυφης ανανέωσης οθόνης: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Κάρτα γραφικών: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Μνήμη κάρτας γραφικών: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Βάθος χρώματος: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Ανάλυση: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Οδηγός Xorg: %s\n"
 
 # Απαλοιφή τόνου, μετατρέπεται αυτόματα σε κεφαλαία #5755.
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "ΡΥΘΜΙΣΕΙΣ Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Καθολικές επιλογές"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Απενεργοποίηση του Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Επιλογές της κάρτας γραφικών"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Ενεργοποίηση της διαφάνειας (επέκταση Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Χρήση της επιτάχυνσης συσκευής για τον δείκτη ποντικιού"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Ενεργοποίηση της επιτάχυνσης RENDER (αυτή η επιλογή ίσως να προκαλέσει "
 "σφάλματα στην εμφάνιση κειμένου)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Ενεργοποίηση της πανομοιότυπης προβολής στην εξωτερική οθόνη"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Ενεργοποίηση πανομοιότυπης προβολής στην δεύτερη οθόνη"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Εξαναγκασμός ρυθμίσεων απεικόνισης του DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 "Ενεργοποίηση της εναλλαγής εξωτερικών οθονών με την συντόμευση πληκτρολογίου "
 "του BIOS"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Χρήση του EXA αντί του XAA (καλύτερη απόδοση για Render και Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Γραφικό περιβάλλον στην εκκίνηση"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Αυτόματη εκκίνηση του γραφικού περιβάλλοντος εργασίας (Xorg), κατά την "
 "εκκίνηση του συστήματος"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -581,816 +586,793 @@ msgstr ""
 "\n"
 "Διαθέτετε αυτό το χαρακτηριστικό;"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Ποιο σύστημα χρησιμοποιεί η τηλεόρασή σας;"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "άλλο"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Τσέχικο (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Γερμανικό"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Ισπανικό"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Φινλανδικό"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Γαλλικό"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Αγγλικό"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Νορβηγικό"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Πολωνικό"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Ρωσικό"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Σουηδικό"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Αμερικάνικο"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Αλβανικό"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Αρμενικό (παλιό)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Αρμενικό (γραφομηχανής)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Αρμενικό (φωνητικό)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Αραβικό"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Αστουριανό"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Αζερμπαϊτζάν (λατινικό)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Βελγικό"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Βεγγαλικό (διάταξη Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Βεγγαλικό (Probhat διάταξη)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Βουλγαρικό (φωνητικό)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Βουλγαρικό (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Βραζιλιάνικο (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Βοσνίας"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Θιβετιανό"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Λευκορωσίας"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Ελβετικό (Γερμανική διάταξη)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Ελβετικό (Γαλλική διάταξη)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Τσεροκικό συλλαβικό"
+"Czech (QWERTZ)"
+msgstr "Τσέχικο (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Τσέχικο (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Γερμανικό"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Γερμανικό (χωρίς νεκρά πλήκτρα)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Δεβαναγαρικό"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Δανικό"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (ΗΠΑ)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Εσπεράντο)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Γαλλικό)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (Ηνωμένου Βασιλείου)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Νορβηγικό)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Πολωνικό)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Σουηδικό)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Εσθονικό"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Ισπανικό"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Φινλανδικό"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Φεροΐκό "
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Γαλλικό (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Γαλλικό (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Γαλλικό (Bepo μόνο λατινικό-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Γαλλικό (Bepo μόνο λατινικό-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Αγγλικό"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Γεωργιανό (\"Ρώσικη\" διάταξη)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Γεωργιανό (\"Λατινική\" διάταξη)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Ελληνικό"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Ελληνικό (πολυτονικό)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Γκουτζαρατικό"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Γκουρμούκι"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Κροατικό"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ουγγρικό"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Ιρλανδικό"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Ισραήλ"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Ισραήλ (φωνητικό)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Ιρανικό"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Ισλανδικό"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Ιταλικό"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Ιαπωνικό 106 πλήκτρων"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Καναδικό"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kyrgyz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Κορεάτικο"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Κουρδικό (αραβικό σενάριο)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Λατινικής Αμερικής"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Λαοτιανό"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Λιθουανικό"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Λετονικό"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Μαλαγιαλαμικό"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Μαορικό"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Π.Γ.Δ.της Μακεδονίας"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Μιανμάρ (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Μογγολικό (κυριλλικό)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Μαλτέζικο (Ηνωμένου Βασιλείου )"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Μαλτέζικο (Η.Π.Α.)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Νιγηριανό"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Ολλανδικό"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Νορβηγικό"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Οριγικό"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Πολωνικό (διάταξη qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Πολωνικό (διάταξη qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Παστού"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Πορτογαλικό"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Καναδικό (Κεμπέκ)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Ρουμανικό (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Ρουμανικό (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Ρουμανικό (βασικό)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Ρωσικό"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Ρωσικό (φωνητικό)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Σουηδικό"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Σλοβενίας"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Σιναλέζικο"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Σλοβακικό (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Σλοβακικό (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Σααμικό (νορβηγικό)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Σααμικό (σουηδικό/φιλανδικό)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Σίντι"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Σέρβικο (κυριλλικό)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Συριακό"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Συριακό (φωνητικό)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Τελούγκου"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Ταμιλικό (διάταξη ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Ταμιλικό (διάταξη γραφομηχανής)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Ταϊλανδέζικο (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Ταϊλανδέζικο (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Ταϊλανδέζικο (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (μαροκινή διάταξη) (+λατινικό/αραβικό)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (φωνητικό) (+λατινικό/αραβικό)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Τατζικικό"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Τουρκμενικό"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Τουρκικό (μοντέλο «F»)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Τουρκικό (μοντέλο «Q»)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ουκρανικό"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Πληκτρολόγιο Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Αμερικάνικο"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Η.Π.Α. πληκτρολόγιο (διεθνές)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Η.Π.Α. πληκτρολόγιο (διεθνές)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (πληκτρολόγιο Η.Π.Α. με 3 επίπεδα για κάθε πλήκτρο)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1399,7 +1381,7 @@ msgstr ""
 "_: πληκτρολόγιο\n"
 "Ουζμπέκικο (κυριλλικό)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1408,7 +1390,7 @@ msgstr ""
 "_: πληκτρολόγιο\n"
 "Βιετναμέζικο \"αριθμητικής σειράς\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1417,92 +1399,92 @@ msgstr ""
 "_: πληκτρολόγιο\n"
 "Γιουγκοσλαβικό (λατινικό)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Δεξιό πλήκτρο Alt"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Ταυτόχρονα και τα δύο πλήκτρα Shift"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ταυτόχρονα τα πλήκτρα Control και Shift"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Πλήκτρο CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Ταυτόχρονα τα πλήκτρα Shift και CapsLock"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ταυτόχρονα τα πλήκτρα Ctrl και Alt"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Ταυτόχρονα τα πλήκτρα Alt και Shift"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Πλήκτρο «Μενού»"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Αριστερό πλήκτρο «Windows»"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Δεξιό πλήκτρο «Windows»"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Ταυτόχρονα και τα δύο πλήκτρα Control"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Ταυτόχρονα και τα δύο πλήκτρα Alt"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Αριστερό πλήκτρο Shift"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Δεξιό πλήκτρο Shift"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Αριστερό πλήκτρο Alt"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Αριστερό πλήκτρο Control"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Δεξί πλήκτρο Control"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1513,12 +1495,12 @@ msgstr ""
 "πλήκτρων εναλλαγής των διατάξεων πληκτρολογίου\n"
 "(π.χ. Αγγλική ή Ελληνική)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Προσοχή"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1530,259 +1512,229 @@ msgstr ""
 "πλήκτρο Control\n"
 "για την αλλαγή της διάταξης του πληκτρολογίου."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Ποντίκι - Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Τυπικό"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Γενικού τύπου ποντίκι PS2 με ροδάκι"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Ποντίκι Kensington Thinking"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 κουμπιού"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Ποντίκι γενικού τύπου με 2 κουμπιά"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Ποντίκι γενικού τύπου 3 κουμπιών με προσομοίωση τροχού"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Με ροδάκι"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "σειραϊκό"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Ποντίκι γενικού τύπου με 3 κουμπιά"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan με προσομοίωση τροχού"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series με προσομοίωση τροχού"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (σειραϊκό, παλαιού τύπου C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (σειραϊκό, παλαιού τύπου C7) με προσομοίωση τροχού"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Ποντίκι Kensington Thinking με προσομοίωση τροχού"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 κουμπιών"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 κουμπιών"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 κουμπιών με προσομοίωση τροχού"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Γενικό"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Οποιοδήποτε PS/2 & USB ποντίκι"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Εξαναγκασμός evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Ελεγκτής Microsoft Xbox S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Ποντίκι VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Ποντίκι VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "κανένα"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Χωρίς ποντίκι"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Δοκιμή του ποντικιού"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Παρακαλώ επιλέξτε το τύπο του ποντικιού σας."
 
 # Απαλοιφή τόνου, μετατρέπεται αυτόματα σε κεφαλαία #5755.
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "ΕΠΙΛΟΓΗ ΠΟΝΤΙΚΙΟΥ"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Εξομοίωση τρίτου κουμπιού;"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Θύρα ποντικιού"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr ""
 "Παρακαλώ επιλέξτε σειραϊκή θύρα στην οποία είναι συνδεδεμένο το ποντίκι σας."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Προσομοίωση κουμπιών"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Προσομοίωση 2 κουμπιών"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Προσομοίωση 3 κουμπιών"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Παρακαλώ δοκιμάστε το ποντίκι"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Για να ενεργοποιήσετε το ποντίκι,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ΚΙΝΗΣΤΕ ΤΟ ΡΟΔΑΚΙ!"
@@ -1847,6 +1799,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Γαλλικό"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Πολωνικό"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Αρμενικό (παλιό)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Τσεροκικό συλλαβικό"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Σίντι"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Ποντίκι - Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Ποντίκι VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Ποντίκι VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Προσομοίωση κουμπιών"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Προσομοίωση 2 κουμπιών"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Προσομοίωση 3 κουμπιών"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr ""
 #~ "_: πληκτρολόγιο\n"
diff --git a/po/eo.po b/po/eo.po
index 4461cd7..8fdd955 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2015-08-30 16:27+0000\n"
 "Last-Translator: gfs1989 <gfs1989@gmx.net>\n"
 "Language-Team: Esperanto (http://www.transifex.com/MageiaLinux/mageia/"
@@ -64,22 +64,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB aŭ pli"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X servilo"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Elektu X-servilon"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Plur-ekrana konfiguraĵo"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -88,12 +88,12 @@ msgstr ""
 "Via sistemo subtenas multkapo-konfiguradon.\n"
 "Kion vi deziras fari?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Elektu memorkapaciton de via grafika karto"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -104,7 +104,7 @@ msgstr ""
 "funkciojn.\n"
 "Ĉu vi deziras uzi ĝin?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -113,75 +113,75 @@ msgstr ""
 "La proprieta pelilo ne estis ĝuste instalita, ni uzas defaŭlte la "
 "liberprograman pelilon."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Konfiguru ĉiujn kapojn sendepende"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Uzu Xinerama extension"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Konfiguru nur karton \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Akomodata"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Konfigurado de la grafika karto kaj ekranbloko"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Ĉesu"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafik-karto"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Ekrano"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Distingivo"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Testo"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opcioj"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Kromaĵoj"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Via Xorg-konfigurado estas rompita, ni ignoros ĝin."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -194,32 +194,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Elektu ekranblokon por kapo #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Elektu ekranon"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Genera"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Vendinto"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -242,22 +242,22 @@ msgstr ""
 "sinkronamplekson kiu estas preter la kapabloj de via ekrano: vi eble\n"
 "difektus vian ekranon.  Se vi dubas, elektu zorgeman opcion."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horizontala sinkronrapido (horizontal sync rate)"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikala refreŝigrapido (vertical refresh rate)"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Elektu kromaĵojn"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -272,7 +272,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -285,83 +285,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 koloroj (8 bitoj)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil koloroj (15 bitoj)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil koloroj (16 bitoj)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milionoj koloroj (24 bitoj)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Aŭtomate"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Distingivoj"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Alia"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Elektu distingivon kaj kolorprofundon"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafika karto: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Jeso"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Nuligu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Helpo"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Provu konfiguraĵon"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Ĉu vi deziras provi la konfiguraĵon?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Averto: provado de ĉi tiu grafika-karto eble svenigos vian komputilon"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -372,158 +372,163 @@ msgstr ""
 "%s\n"
 "Provu ŝanĝi iujn parametrojn"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Eliras post %d sekundoj"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Ĉu tiu ĉi konfigurado ĝustas?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "ne"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "jes"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D-aparat-akcelado: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klavara aranĝo: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Klavara aranĝo: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Speco de muso: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Ekrano: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Ekrana horizontala sinkronrapido (horizontal sync rate): %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Ekrana vertikala refreŝigrapido (vertical refresh rate): %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafika karto: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Graifka memoro: %s KB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Kolorprofuneco: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Distingivo: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg pelilo: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg Konfigurado"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Ĝeneralaj opcioj"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Malŝati CTRL-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opcioj por la grafika karto"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Aktivigi travideblon (etendiĝo de Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Uzi aparat-akcelitan musmontrilon"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Aktivigi la akcelilon RENDER (tio povas kaŭzi nenormalaĵojn ĉe tekst-afiŝado)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Aktivigi duoblan afiŝadon sur eksterna ekranbloko"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Aktivigi duoblan afiŝadon sur la dua ekrano"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Aktivigi butonon por ŝalti al ekstera ekranbloko per BIOS-ŝaltado"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Uzu EXA anstataŭ XAA (pli bona rezulto por Render kaj Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X Fenestro ĉe komenco"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Aŭtomate lanĉi la grafikan interfacon (Xorg)ĉe starto"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -544,922 +549,899 @@ msgstr ""
 "\n"
 "Ĉu vi havas tiun konektilon?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Kiun normon uzas via TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "alia"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Ĉeĥa (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Germana"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak-a"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Hispana"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finna"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Franca"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Unuiĝinta Regna klavaro"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norvega"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Pola"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Rusa"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Sveda"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Usona klavaro"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albana"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armena (malnova)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armena (skribmaŝina)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armena (fonetika)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "araba"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr ""
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbajĝana (latina)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belga"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengala (Inscript aranĝo)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengala (Probhat aranĝo)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgara (fonetika)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgara (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazila (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosna"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibeta"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarusa"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Svisa (germana aranĝo)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Svisa (franca aranĝo)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Ĉeroka silaba"
+"Czech (QWERTZ)"
+msgstr "Ĉeĥa (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Ĉeĥa (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Germana"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Germana (neniom da mortaj klavoj)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "devanagara"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dana"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak-a (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak-a (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak-a (Franca)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak-a (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak-a (Norvega)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak-a (Pola)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak-a (Sveda)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estona"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Hispana"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finna"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Feroa"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Franca"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Franca"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Greka (plurakcenta)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Greka (plurakcenta)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Unuiĝinta Regna klavaro"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Kartvela (\"Rusa\" aranĝo)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Kartvela (\"Latina\" aranĝo)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Greka"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Greka (plurakcenta)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "gujarata"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "gumurka"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroata"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hungara"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irlanda"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "inuita"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israela"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israela (fonetika)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Irana"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islanda"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Itala"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japana 106 klavoj"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kanada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgiza"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korea klavaro"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurda (araba skribo)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latinamerika"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laosa"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latva"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malajalama"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maora"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedona"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Mianmara (burma)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongola (cirila)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Malta (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Malta (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Niĝeria"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Nederlanda"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norvega"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oria"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Pola (qwerty aranĝo)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Pola (qwertz aranĝo)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Paŝtua"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugala"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanada (Kebeka)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumana (qwertz-a)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumana (qwerty-a)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumana (qwertz-a)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Rusa"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Rusa (fonetika)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Sveda"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovena"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovaka (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovaka (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saama (norvega)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saama (sveda/finna)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sinda"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serba (cirila)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Siria"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Siria (fonetika)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugua"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamila (ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamila (skribmaŝina)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Taja (Kedmana)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Taja (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Taja (Pataĉota)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifina (maroka aranĝo) (+latina/araba)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifina (fonetika( (+latina/araba)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Taĝika"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmena"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrajna"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdua"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Usona klavaro"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Usona klavaro (internacia)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Usona klavaro (internacia)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (Usona klavaro kun 3 niveloj po klavo)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbeka (cirila)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vjetnama \"numero-vica\" QWERTY-a"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslava (latina)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Dekstra ALT-klavo"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Ambaŭ MAJ-klavoj samtempe"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Klavoj CTRL kaj MAJ samtempe"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Klavo CapsLock (riglas majusklojn)"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Klavoj MAJ kaj CapsLock (riglado de majuskloj) samtempe"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Klavoj CTRL kaj ALT samtempe"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Klavoj ALT kaj MAJ samtempe"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menuo\"-klavo"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Maldekstra \"Vindozo\"-klavo"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Dekstra \"Vindozo\"-klavo"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Ambaŭ klavoj CTRL samtempe"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Ambaŭ klavoj ALT samtempe"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Maldekstra MAJ-klavo"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Dekstra MAJ-klavo"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Maldekstra MAJ-klavo"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Maldekstra CTRL-klavo"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Dekstra CTRL-klavo"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1470,12 +1452,12 @@ msgstr ""
 "ebligos al vi ŝalti inter la diversaj klavaroj\n"
 "(ekz-e latinaj kaj ne-latinaj)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Averto"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1486,257 +1468,227 @@ msgstr ""
 "Dum la instalado vi ne bezonas uzi la klavon Dekstra CTRL\n"
 "por ŝalti inter la diversaj klavar-aranĝoj."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Muso"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Laŭnorma"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Loĝiteka MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Nespecifa PS2 RadoMuso"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Mikrosofta Esplorilo"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 butona"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Nespecifa 2 Butona Muso"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Norma 3-butona muso kun radet-imito"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rado"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seria"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Nespecifa 3 Butona Muso"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Mikrosofta IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Loĝiteka MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Loĝiteka MouseMan kun radet-imito"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Loĝiteka CC serio"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Loĝiteka CC serioj kun radet-imito"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Loĝiteka MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Serio"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Loĝiteka Muso (seria, malnova C7 speco)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Loĝiteka Muso (seria, malnova C7 speco) kun radet-imito"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse kun radet-imito"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "bus-muso"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 butonoj"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 butonoj"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3-butona muso kun radet-imito"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universala"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Ajnaj PS/2- kaj USB-musoj"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Trudi evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Mikrosofta Xbox kontrolilo S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "neniu"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Neniu Muso"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Testanta la muson"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Bonvole elektu la specon de via muso."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Mus-elekto"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Ĉu vi deziras emuli trian musbutonon?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Muspordo"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Bonvole, elektu al kiu seria pordo estas via muso konektata."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Buton-imito"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "2-buton-imito"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3-buton-imito"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Bonvole, provu la muson"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Por aktivigi la muson,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MOVU VIAN RADON!"
@@ -1794,3 +1746,45 @@ msgstr ""
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak-a"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Franca"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Pola"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armena (malnova)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Ĉeroka silaba"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sinda"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Muso"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Buton-imito"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "2-buton-imito"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3-buton-imito"
diff --git a/po/es.po b/po/es.po
index 3f76755..5c20cda 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-07-04 14:25+0000\n"
 "Last-Translator: Miguel Ortega\n"
 "Language-Team: Spanish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -68,22 +68,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB o más"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Servidor X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Seleccione un servidor X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configuración multi-monitor"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -92,12 +92,12 @@ msgstr ""
 "Su sistema soporta configuración multi-monitor.\n"
 "¿Qué desea hacer?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Seleccione la cantidad de memoria de su tarjeta gráfica"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -108,7 +108,7 @@ msgstr ""
 "soportar características adicionales.\n"
 "¿Desea utilizarlo?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -117,75 +117,75 @@ msgstr ""
 "El controlador propietario no se instaló adecuadamente, cambiando al "
 "controlador de software libre."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configurar los monitores independientemente"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Usar extensión Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configurar sólo la tarjeta \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personalizada"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Configuración de la tarjeta gráfica y del monitor"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Salir"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Tarjeta gráfica"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Resolución"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Probar"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opciones"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Extensiones"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Su fichero de configuración Xorg está dañado, será ignorado."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -198,32 +198,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Elija un monitor para cabeza #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Elija un monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Genérico"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Fabricante"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -248,22 +248,22 @@ msgstr ""
 "puede dañar su monitor.\n"
 " En caso de duda, elija una configuración conservadora."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Frecuencia de barrido horizontal"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Frecuencia de barrido vertical"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Elija los complementos"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -289,7 +289,7 @@ msgstr ""
 "\"Configurar el servidor gráfico\" en el Centro de Control y re-"
 "seleccionando su tarjeta gráfica."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -311,83 +311,83 @@ msgstr ""
 "y quitar programas\" e instale manualmente el paquete de firmware o "
 "reconfigure su tarjeta gráfica."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 colores (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil colores (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil colores (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 millones de colores (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Resoluciones"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Otros"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Elija la resolución y la profundidad de colores"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Tarjeta gráfica: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Ayuda"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Probar la configuración"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "¿Desea probar la configuración?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Advertencia: probar esta tarjeta de vídeo puede colgar su computadora"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -398,157 +398,162 @@ msgstr ""
 "%s\n"
 "Intente cambiar algunos parámetros"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Saliendo en %d segundos"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "¿Es esta la configuración correcta?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Deshabilitar Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "no"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "si"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Aceleración 3D por hardware: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Distribución del teclado: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Distribución del teclado: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipo de ratón: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Frecuencia horizontal del monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Frecuencia vertical del monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Tarjeta gráfica: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memoria de la tarjeta gráfica: %s KB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Profundidad de color: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolución: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Controlador Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Configuración de Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Opciones globales"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Deshabilitar Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opciones de la tarjeta gráfica"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Habilitar translucidez (Extensión Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Utilizar un ratón con aceleración por hardware"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Habilitar aceleración RENDER (puede causar problemas al mostrar texto)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Habilitar pantalla duplicada en el monitor externo"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Habilitar pantalla duplicada en la segunda pantalla"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Forzar el modo de visualización de la DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Habilitar \"hotkey\" del BIOS para cambiar al monitor externo"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Usar EXA en vez de XAA (mejor rendimiento para Render y Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X al arrancar"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Activación automática del interfaz gráfico (Xorg) al arrancar."
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -569,12 +574,12 @@ msgstr ""
 "\n"
 "¿Tiene Usted esta característica?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "¿Qué norma está utilizando su TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
@@ -583,122 +588,35 @@ msgstr ""
 "_:opción extraña de ratio\n"
 "otro"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Checo (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Alemán"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Español"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finlandés"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francés"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Británico"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Noruego"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polaco"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Ruso"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Sueco"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Estadounidense"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albano"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenio (antiguo)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenio (nuevo)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenio (fonético)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arábico"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -707,788 +625,852 @@ msgstr ""
 "_: teclado\n"
 "Asturiano"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbadján (latín)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belga"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalí (disposición Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalí (disposición Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Búlgaro (fonético)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Búlgaro (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasileño (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnio"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetano"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Bielorruso"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Suizo (germánico)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Suizo (francés)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee silábico"
+"Czech (QWERTZ)"
+msgstr "Checo (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Checo (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Alemán"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Alemán (sin teclas muertas)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Indio (Devanagari)"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danés"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Francés)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Noruego)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polaco)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Sueco)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonio"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Español"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finlandés"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Feroés"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francés (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Francés (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Francés (Bepo, solo latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Francés (Bepo, solo latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Británico"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgiano (estilo \"ruso\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgiano (estilo \"latín\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Griego"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Griego (politónico)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Indio (Gujarati)"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Indio (Gurmukhi)"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croata"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Húngaro"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "irlandés"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelí"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelí (fonético)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iraní"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandés"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italiano"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japonés de 106 teclas"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Teclado Kyrgyz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Coreano"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdo (escritura árabe)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latinoamericano"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laosiano"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Lituano"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Letón"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayo"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maorí"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedonio"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Birmano)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongol (cirílico)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltés (Reino Unido)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltés (EE.UU.)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeriano"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Holandés"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Noruego"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polaco (disposición qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polaco (disposición qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugués"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canadiense (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumano (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumano (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumano (básico)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Ruso"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Ruso (fonético)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Sueco"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Esloveno"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Eslovaco (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Eslovaco (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (noruego)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (sueco/finlandés)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbio (cirílico)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syriac"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syriac (fonético)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (disposición ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (disposición de máquina de escribir)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thailandés (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tailandés (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tailandés (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (marroquí) (+latín/árabe)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonético) (+latín/árabe)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Teclado tajik"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmeno"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turco (modelo \"F\")"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turco (modelo \"Q\")"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Teclado Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Estadounidense"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Estadounidense (internacional)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Estadounidense (internacional)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (Teclado EE.UU. con 3 niveles por tecla)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbek (cirílico)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita \"numérico\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Yugoslavo (latín)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Tecla Alt derecha"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Ambas teclas Mayús simultáneamente"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Las teclas Control y Mayús simultáneamente"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Tecla CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Las teclas Mayús y CapsLock simultáneamente"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Las teclas Ctrl y Alt simultáneamente"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Las teclas Alt y Shift simultáneamente"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "La tecla \"Menú\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Tecla \"Windows\" de la izquierda"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Tecla \"Windows\" de la derecha"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Ambas teclas Control simultáneamente"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Ambas teclas Alt simultáneamente"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Tecla Mayús izquierda"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Tecla Mayús derecha"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Tecla Alt izquierda"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Tecla Control izquierda"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Tecla Control derecha"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1499,12 +1481,12 @@ msgstr ""
 "cambiar entre los diferentes esquemas de teclado\n"
 "(ej.: latino y no latino)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1515,257 +1497,227 @@ msgstr ""
 "Durante la instalación, deberá utilizar la tecla Control derecha\n"
 "para cambiar entre las distintas distribuciones de teclado."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Ratón Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Estándar"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Ratón genérico PS2 con rueda"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 botón"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Ratón de 2 botones genérico"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Ratón de 3 botones genérico con emulación de rueda"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rueda"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serie"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Ratón de 3 botones genérico"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan con emulación de rueda"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series con emulación de rueda"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Ratón Logitech (serie, antiguo tipo C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Ratón Logitech (serie, antiguo tipo C7) con emulación de rueda"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse con emulación de rueda"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "ratón bus"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 botones"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 botones"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 botones con emulación de rueda"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Cualquier ratón PS/2 y USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Forzar evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Controlador S de Microsoft Xbox"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Ratón de VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Ráton VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ninguno"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Sin ratón"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Probando el ratón"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Seleccione el tipo de su ratón, por favor."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Elección del ratón"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "¿Emular el tercer botón?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Puerto del ratón"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Seleccione el puerto serie al que está conectado el ratón, por favor."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulación de botones"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulación del botón 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulación del botón 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Pruebe su ratón, por favor."
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Para activar el ratón,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "¡MUEVA SU RUEDA!"
@@ -1823,3 +1775,51 @@ msgstr "Configurar servidor gráfico"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "Se require autenticación para configurar el servidor gráfico"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francés"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polaco"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenio (antiguo)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee silábico"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Ratón Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Ratón de VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Ráton VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulación de botones"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulación del botón 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulación del botón 3"
diff --git a/po/et.po b/po/et.po
index ade2221..72f44ac 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-07-25 06:14+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <i18n-et@ml.mageia.org>\n"
@@ -63,22 +63,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB või rohkem"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Valige X server"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Mitme monitori seadistamine"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -87,12 +87,12 @@ msgstr ""
 "Süsteemis on võimalik kasutada mitut monitori.\n"
 "Mida Te soovite teha?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Valige graafikamälu suurus"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -103,7 +103,7 @@ msgstr ""
 "võimalusi.\n"
 "Kas soovite seda kasutada?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -112,75 +112,75 @@ msgstr ""
 "Kommertsdraiver ei ole korrektselt paigaldatud, kasutatakse vaba tarkvara "
 "draiverit."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Seadistada kõik monitorid sõltumatult"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Kasutada Xinerama laiendusi"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Seadistada ainult kaardi \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Kohandatud"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Graafikakaardi ja monitori seadistamine"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Välju"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Graafikakaart"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Ekraanilahutus"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Eelistused"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Pluginad"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Teie Xorg-i seadistustefail on vigane, seda eiratakse."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -193,32 +193,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Valige monitor peale #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Valige monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Tavaline"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Tootja"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -240,22 +240,22 @@ msgstr ""
 "hävida.\n"
 "Kui kahtlete, valige pigem väiksem väärtus."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Realaotussagedus"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Ekraaniuuendussagedus"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Valige pluginad"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -280,7 +280,7 @@ msgstr ""
 "juhtimiskeskuses sektsiooni \"Graafikaserveri seadistamine\" ja seal juba "
 "oma videokaardi."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -301,83 +301,83 @@ msgstr ""
 "'nonfree' hoidla kasutamine ning paigaldage püsivarapakett käsitsi või "
 "seadistage videokaart uuesti."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 värvi (8 bitti)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tuhat värvi (15 bitti)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tuhat värvi (16 bitti)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miljonit värvi (24 bitti)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automaatne"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Ekraanilahutused"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Muu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Valige ekraanilahutus ja värvisügavus"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Graafikakaart: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Abi"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Seadistuste proovimine"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Kas soovite seadistusi proovida?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Hoiatus: selle graafikakaardi test võib Teie arvuti peatada"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -388,157 +388,162 @@ msgstr ""
 "%s\n"
 "Proovige mõnda parameetrit muuta"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Lõpuni %d sekundit"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Kas see on sobiv?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Ctrl+Alt+Backspace'i keelamine: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "ei"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "jah"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D riistvaraline kiirendus: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klaviatuuriasetus: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Klaviatuuriasetus: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Hiire tüüp: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Realaotussagedus: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Ekraaniuuendussagedus: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Graafikakaart: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Videomälu: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Värvisügavus: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Ekraanilahutus: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg-i draiver: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg-i seadistused"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Globaalsed valikud"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Ctrl+Alt+Backspace'i keelamine"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Graafikakaardi valikud"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Läbipaistvuse lubamine (komposiitlaiend)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Riistvaraliselt kiirendatud hiirekursori kasutamine"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "RENDER-kiirenduse lubamine (võib tekitada teksti kuvamisel vigu)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Topeltkuva lubamine välises monitoris"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Topeltkuva lubamine teisel kuval"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "DVI kuvarežiimi kehtestamine"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "BIOS-e kiirklahvi lubamine välise monitori lülitamiseks"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "EXA kasutamine XAA asemel (Render'i ja Composite'i parem jõudlus)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X käivitub koos süsteemiga"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Graafikaliidese (Xorg) käivitamine automaatselt arvuti käivitamisel"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -558,922 +563,899 @@ msgstr ""
 "\n"
 "Kas soovite seda kasutama hakata?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Millist TV-standardit Te kasutate?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "muu"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tšehhi (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Saksa"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Hispaania"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Soome"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Prantsuse"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Briti"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norra"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Poola"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Vene"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Rootsi"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "USA"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albaania"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armeenia (vanem)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armeenia (trükimasin)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armeenia (foneetiline)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Araabia"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Astuuria"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Aserbaidžaani (ladina)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgia"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (Inscript asetus)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (Probhat asetus)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgaaria (foneetiline)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgaaria (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasiilia (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnia"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/tiibeti"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Valgevene"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Šveitsi (Saksa asetus)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Šveitsi (Prantsuse asetus)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Šerokii silpkiri"
+"Czech (QWERTZ)"
+msgstr "Tšehhi (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tšehhi (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Saksa"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Saksa (ilma sammuta)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanaagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Taani"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Prantsuse)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (Briti)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norra)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Poola)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Rootsi)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Eesti"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Hispaania"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Soome"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Fääri"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Prantsuse (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Prantsuse (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Prantsuse (Bepo, ainult latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Prantsuse (Bepo, ainult latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Briti"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gruusia (\"vene\" asetus)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gruusia (\"ladina\" asetus)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Kreeka"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Kreeka (polütoonne)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gudžarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Horvaadi"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungari"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Iiri"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktituti"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Iisraeli"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Iisraeli (foneetiline)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iraani"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandi"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Itaalia"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Jaapani 106 klahviga"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgiisi"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korea"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdi (araabia kiri)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Ladina-Ameerika"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laose"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Leedu"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Läti"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malajalami"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maoori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedoonia"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmari (Birma)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongoli (kirillitsa)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Malta (briti)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Malta (USA)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeeria"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Hollandi"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norra"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oria"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Poola (QWERTY)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Poola (QWERTZ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Puštu"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugali"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanada (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumeenia (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumeenia (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumeenia (põhiline)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Vene"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Vene (foneetiline)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Rootsi"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Sloveenia"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Singali"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovaki (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovaki (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Norra)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (Rootsi/Soome)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbia (kirillitsa)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Süüria"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Süüria (foneetiline)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamili (ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamili (kirjutusmasin)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (Maroko paigutus) (+ladina/araabia)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (foneetiline) (+ladina/araabia)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadžiki"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Türkmeeni"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Türgi (\"F\" mudel)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Türgi (\"Q\" mudel)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukraina"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "USA"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "USA (rahvusvaheline)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "USA (rahvusvaheline)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (USA klaviatuur kolmetasemeliste klahvidega)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Usbeki (kirillitsa)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnami \"numbrireaga\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslaavia (ladina)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Parempoolne Alt-klahv"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Mõlemad Shift-klahvid korraga"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrl- ja Shift-klahvid korraga"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock-klahv"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift- ja CapsLock-klahvid korraga"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl- ja Alt-klahvid korraga"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt- ja Shift-klahvid korraga"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menüü\"-klahv"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Vasakpoolne \"Windows\"-klahv"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Parempoolne \"Windows\"-klahv"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Mõlemad Ctrl-klahvid korraga"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Mõlemad Alt-klahvid korraga"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Vasakpoolne Shift-klahv"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Parempoolne Shift-klahv"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Vasakpoolne Alt-klahv"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Vasakpoolne Ctrl-klahv"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Parempoolne Ctrl-klahv"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1483,12 +1465,12 @@ msgstr ""
 "Siin saab valida klahvi või klahvikombinatsiooni, mis laseb\n"
 "vahetada klaviatuuri (nt. ladina ja mitte-ladina tähestikuga)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1499,257 +1481,227 @@ msgstr ""
 "Paigaldamise ajal tuleb erinevate klaviatuuripaigutuste\n"
 "vahel liikumiseks kasutada parempoolset Ctrl-klahvi."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Suni hiir"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standardne"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Tavaline PS2 rattaga hiir"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 nupuga"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Tavaline 2 nupuga hiir"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Tavaline 3 nupuga hiir ratta emuleerimisega"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rattaga"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "jadapordi"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Tavaline 3 nupuga hiir"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan ratta emuleerimisega"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC seeria"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC seeria ratta emuleerimisega"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM seeria"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech (jadaport, vana C7 tüüpi)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech (jadaport, vana C7 tüüpi) ratta emuleerimisega"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse ratta emuleerimisega"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "siinihiir"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 nupuga"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 nupuga"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 nupuga hiir ratta emuleerimisega"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universaalne"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Suvaline PS/2 ja USB hiir"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Evdev jõuga"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBoxi hiir"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware hiir"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "puudub"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Hiir puudub"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Hiire testimine"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Palun valige oma hiire tüüp."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Hiire valik"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Kas emuleerida keskmist hiirenuppu?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Hiire port"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Millisesse jadaporti on Teie hiir ühendatud?"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Nuppude emuleerimine"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "2. nupu emuleerimine"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3. nupu emuleerimine"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Palun testige hiirt"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Hiire aktiveerimiseks"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "KEERUTAGE RATTAKEST!"
@@ -1810,6 +1762,54 @@ msgstr "Mageia graafikakaardi ja monitori seadistamine nõuab autentimist"
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Prantsuse"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Poola"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armeenia (vanem)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Šerokii silpkiri"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Suni hiir"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBoxi hiir"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware hiir"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Nuppude emuleerimine"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "2. nupu emuleerimine"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3. nupu emuleerimine"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Türgi (traditsiooniline \"F\" mudel)"
 
diff --git a/po/eu.po b/po/eu.po
index c81f47c..3d0a1d6 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-07-02 14:11+0000\n"
 "Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -65,22 +65,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB edo gehiago"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X zerbitzaria"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Aukeratu X zerbitzari bat"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Buru anitzeko konfigurazioa"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -89,12 +89,12 @@ msgstr ""
 "Zure sistemak buru anitzeko konfigurazioa onartzen du.\n"
 "Zer egin nahi duzu?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Hautatu zure txartel grafikoaren memoria kopurua"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -105,7 +105,7 @@ msgstr ""
 "onar ditzakeena.\n"
 "Hura erabili nahi duzu?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -114,76 +114,76 @@ msgstr ""
 "Gidari propietarioa ez da era egokian instalatu, software askeko gidari "
 "lehenetsia erabiltzen."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Buru guztiak independenteki konfiguratu"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Erabili Xinerama luzapena"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "\"%s\"%s txartela bakarrik konfiguratu"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Pertsonalizatua"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Txartel grafiko eta monitorearen konfiguraketa"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Irten"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Txartel grafikoa"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitorea"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Bereizmena"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Probatu"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Aukerak"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Pluginak"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 "Zure Xorg konfigurazio fitxategia hondatuta dago, baztertu egingo dugu."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -196,32 +196,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Aukeratu monitorea bat %d. buruarentzako"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Aukeratu monitorea"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generikoa"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Hornitzailea"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -245,22 +245,22 @@ msgstr ""
 "handiagoko monitorerik ez zehaztea: monitorea honda dezakezu.\n"
 " Zalantzarik baduzu, aukeratu ezarpen kontserbadore bat."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Freskatze-maiztasun horizontala"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Freskatze-maiztasun bertikala"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Aukeratu pluginak"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -284,7 +284,7 @@ msgstr ""
 "birkonfiguratu \"Grafiko zerbitzaria konfiguratu\"-ra joz, Mageia Kontrol "
 "Gunean eta berriro hautatu zure grafiko txartela."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -304,83 +304,83 @@ msgstr ""
 "'ezlibre'biltegia ahalbidetu \"Instalatu eta softwarea kendu\"-ean eta "
 "firmware-paketea eskuz instalatu edo zure grafiko-txartela birkonfiguratu."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 kolore (8 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mila kolore (15 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mila kolore (16 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milioi kolore (24 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Bereizmenak"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Bestelakoak"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Aukeratu bereizmena eta kolorearen sakonera"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Txartel grafikoa: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ados"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Laguntza"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Konfigurazioaren proba"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Konfigurazioa probatu nahi duzu?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Abisua: txartel grafiko hau probatzean ordenagailua blokea daiteke"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -391,158 +391,163 @@ msgstr ""
 "%s\n"
 "Saiatu parametro batzuk aldatuta"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d segundo barru irtengo da"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Ezarpen hau zuzena da?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Ezgaitu Ktrl-Alt-Atzera: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "ez"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "bai"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D hardware azelerazioa: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Teklatu-diseinua: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Teklatu-diseinua: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Sagu-mota: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitorea: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitorearen sinkronizazio horizontala: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitorearen freskatze bertikala: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Txartel grafikoa: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafiko-memoria: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Kolorearen sakonera: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Bereizmena: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg kontrolatzailea: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg konfigurazioa"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Aukera orokorrak"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Ezgaitu Ktrl-Alt-Atzera"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Txartel grafikoaren aukerak"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Gaitu zeharrargitasuna (Composite luzapena)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Erabili hardware bitartez azeleratutako sagu erakuslea"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Gaitu RENDER azelerazioa (honek testuak erakusterakoan akatsak sortu ditzake)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Gaitu bistaratze bikoiztua kanpoko monitorean"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Gaitu bistaratze bikoiztua bigarren pantailan"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Behartu DVI-ren bistaratze modua"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Gaitu BIOS laster-teklak kanpoko monitorearekin trukatzeko"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Erabili EXA XAA ordez (Render eta Compositerentzat performatzia hobea)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Interfaze grafikoa abioan"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Automatikoki abiatu interfaze grafikoa (Xorg) abiatzerakoan"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -563,922 +568,899 @@ msgstr ""
 "\n"
 "Baduzu eginbide hori?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Zein arau erabiltzen du zure telebistak?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "beste bat"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "txekiarra (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "alemana"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Epainiarra"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finlandiarra"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Frantsesa"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Erresuma Batuko teklatua"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norvegiarra"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Poloniarra"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Errusiarra"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Suediarra"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Estatu Batuetako teklatua"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albaniarra"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armeniarra (zaharra)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armeniarra (idazmakina)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armeniarra (fonetikoa)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabiarra"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Asturiarra"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaijandarra (latinoa)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgikarra"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengaliarra (Inscript-diseinua)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengaliarra (Probhat-diseinua)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgariarra (fonetikoa)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgariarra (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasildarra (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosniarra"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetarra"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Bielorrusiarra"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Suitzarra (diseinu alemana)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Suitzarra (diseinu frantsesa)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee silabikoa"
+"Czech (QWERTZ)"
+msgstr "txekiarra (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Txekiarra (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "alemana"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Alemana (letra zaharkiturik ez)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Daniarra"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (Estatu Batuak)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperantoa)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Frantsesa)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (Erresuma Batua)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norvegiarra)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Poloniarra)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Suediarra)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estoniarra"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Epainiarra"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finlandiarra"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faroera"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Frantzesa (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Frantzesa (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Frantzesa (Bepo, soilik latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Frantzesa (Bepo, soilik latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Erresuma Batuko teklatua"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgiarra (diseinu \"errusiarra\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgiarra (diseinu \"latinoa\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grekoa"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grekoa (politonikoa)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujeratiarra"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi-koa"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroaziarra"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hungariarra"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irlandarra"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israeldarra"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israeldarra (fonetikoa)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Irandarra"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandiarra"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italiarra"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japoniarra 106 tekla"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kyrgyz teklatua"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Koreako teklatua"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdua (arabierazko letretan)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latinamerikarra"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laostarra"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Lituaniera"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Letoniarra"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalama"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maoriera"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Mazedoniarra"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmartarra (Birmania)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongoliarra (zirilikoa)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltarra (Erresuma Batua)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltarra (AEB)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeriarra"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Holandarra"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norvegiarra"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Poloniarra (qwerty diseinua)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Poloniarra (qwertz diseinua)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Paxtuera"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugesa"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadarra (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Errumaniarra (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Errumaniarra (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Errumaniera (oinarrizkoa)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Errusiarra"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Errusiarra (fonetikoa)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Suediarra"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Esloveniarra"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Eslovakiarra (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Eslovakiarra (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norvegiarra)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (suediarra/finlandiarra)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbiarra (zirilikoa)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Siriarra"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Siriarra (fonetikoa)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamila (ISCII-diseinua)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamila (Idazmakina-diseinua)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (marokoar diseinua) (+latindarra/arabiarra)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonetikoa) (+latindarra/arabiarra)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadjikistango teklatua"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmenistandarra"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turkiera (\"F\" eredua)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turkiera (\"Q\" eredua)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainarra"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu teklatua"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Estatu Batuetako teklatua"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Estatu Batuetako teklatua (nazioartekoa)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Estatu Batuetako teklatua (nazioartekoa)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (AEB teklatua teklako 3 mailarekin)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbekistandarra (zirilikoa)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamdarra QWERTY \"ilara numerikoa\""
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslaviarra (latinoa)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Eskuineko Alt tekla"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Bi Maius teklak batera"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Kontrol eta Maius teklak batera"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "BlokMaius tekla"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Maius eta BlokMaius teklak batera"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ktrl eta Alt teklak batera"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt eta Maius teklak batera"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\" tekla"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Ezkerreko \"Windows\" tekla"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Eskuineko \"Windows\" tekla"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Bi Kontrol teklak batera"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Bi Alt teklak batera"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Ezkerreko Maius tekla"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Eskuineko Maius tekla"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Ezkerreko Alt tekla"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Ezkerreko Kontrol tekla"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Eskuineko Kontrol tekla"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1489,12 +1471,12 @@ msgstr ""
 "tekla-konbinazioa hauta dezakezu hemen\n"
 "(adib.: latinoa edo ez-latinoa)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1505,257 +1487,227 @@ msgstr ""
 "Instalazioa egiten ari zaren bitartean, eskuineko \n"
 "kontrol-tekla erabili beharko duzu teklatuz aldatzeko."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Sagua"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Estandarra"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Gurpildun PS2 sagu generikoa"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking sagua"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 botoi"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "2 botoiko sagu generikoa"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "3 botoiko sagu generikoa gurpil-emulazioarekin"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Gurpila"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seriekoa"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "3 botoiko sagu generikoa"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan gurpil-emulazioarekin"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series gurpil-emulazioarekin"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech sagua (seriekoa, C7 mota zaharrekoa)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech sagua (seriekoa, C7 mota zaharrekoa) gurpil-emulazioarekin"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse gurpil-emulazioarekin"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "bus-sagua"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 botoi"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 botoi"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 botoi gurpil-emulazioarekin"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Unibertsala"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Edozein PS/2 eta USB sagu"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "evdev behartu"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox S Kontrolatzailea"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox sagua"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware sagua"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "bat ere ez"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Sagurik gabe"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Sagua probatzen"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Aukeratu sagu-mota."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Sagu aukeraketa"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Hirugarren botoia emulatu?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Sagu-ataka"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Aukeratu sagua konektatuta dagoen serieko ataka."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Botoien emulazioa"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "2. botoiaren emulazioa"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3. botoiaren emulazioa"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Probatu sagua"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Sagua aktibatzeko,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MUGITU GURPILA!"
@@ -1815,3 +1767,51 @@ msgstr "Exekutatu Mageia-ren Konfigurazio Grafikoa"
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 "Egiaztatzea beharrezkoa da exekutatzeko Mageia-renKonfigurazio Grafikoa"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Frantsesa"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Poloniarra"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armeniarra (zaharra)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee silabikoa"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Sagua"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox sagua"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware sagua"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Botoien emulazioa"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "2. botoiaren emulazioa"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3. botoiaren emulazioa"
diff --git a/po/fa.po b/po/fa.po
index 483e7fd..f9ef9cd 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-fa\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2005-02-26 06:31+0100\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -60,22 +60,22 @@ msgstr "۳۲ مگابایت"
 msgid "64 MB or more"
 msgstr "۶۴ مگابایت یا بیشتر"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "کارگزار X "
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "انتخاب یک کارگزار X "
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "پیکربندی چند-سر"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -84,12 +84,12 @@ msgstr ""
 "سیستم شما از پیکربندی چند سر پشتیبانی می‌کند.\n"
 "چکار می خواهید انجام دهید؟"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "انتخاب اندازه‌ی حافظه‌ی کارت گرافیک‌تان"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -97,82 +97,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "پیکربندی همه‌ی سرها بطور مستقل"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "استفاده از توسعه‌ی Xinerama "
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "فقط پیکربندی کارت \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "سفارشی"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "پیکربندی اتصال"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "ترک"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "کارت گرافیک"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "نمایشگر"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "تفکیک‌پذیری"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "آزمایش"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "گزینه‌ها"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "متصل‌کننده"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "پرونده پیکربندی Xorg خراب شده است، آن را نادیده میگیریم."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -185,32 +185,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "نمایشگری را برای سر #%d انتخاب کنید"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "انتخاب نمایشگری"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "عمومی"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "فروشنده"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -233,22 +233,22 @@ msgstr ""
 "بیش از قدرت نمایشگرتان انتخاب نکنید: شما می‌توانید با این کار نمایشگر\n"
 "خود را خراب کنید. اگر شک دارید، یک تنظیم محافظه‌کارانه‌ای را انتخاب کنید."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "میزان نوسازی افقی"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "میزان نوسازی عمودی"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "انتخاب کنش"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -263,7 +263,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -276,83 +276,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "۲۵۶ رنگ (۸ بیت)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "۳۲ هزار رنگ (۱۵بیت)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "۶۵ هزار رنگ (۱۶بیت)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "۱۶ میلیون رنگ (۲۴ بیت)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "خودکار"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "تفکیک‌پذیری‌ها"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "دیگری"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "انتخاب تفکیک‌پذیری و عمق رنگ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "کارت گرافیک: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "تأیید"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "لغو"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "راهنما"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "آزمایش پیکربندی"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "آیا می‌خواهید پیکربندی را امتحان کنید؟"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "هشدار: آزمایش این کارت گرافیکی ممکن است باعث توقف رایانه‌ی شما شود"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -363,152 +363,157 @@ msgstr ""
 "%s\n"
 "تغییر دادن بعضی از پارامترها را امتحان کنید"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "ترک در %d ثانیه"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "آیا این تنظیم درست است؟"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "هیچکدام"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "طرح صفحه‌کلید: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "طرح صفحه‌کلید: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "نوع موشی: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "نمایشگر: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "هم‌گاهی‌افقی نمایشگر: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "نوسازی عمودی نمایشگر: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "کارت گرافیک: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "حافظه گرافیک: %s کیلوبایت\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "عمق رنگ: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "تفکیک‌پذیری: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "راه‌انداز Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "پیکربندی Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "کارت گرافیک: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "واسط گرافیکی در شروع"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
@@ -516,7 +521,7 @@ msgstr ""
 "برپاسازی خودکار کنم.\n"
 "مایل هستید Xorg شروع گردد وقتی آغازگری مجدد می‌کنید؟"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -537,922 +542,899 @@ msgstr ""
 "\n"
 "آیا این قابلیت وجود دارد؟"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "تلویزیون شما از چه مأخذی استفاده می‌کند؟"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "چک (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "آلمانی"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "دوراک"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "اسپانیایی"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "فنلاندی"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "فرانسوی"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "صفحه‌کلید انگلیسی"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "نروژی"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "لهستانی"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "روسی"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "سوئدی"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "صفحه‌کلید آمریکایی"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "آلبانیایی"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "ارمنی"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "ارمنی (ماشین‌نویس)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "ارمنی (تلفظی)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "عربی"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "استونیایی"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "آذربایجان (لاتین)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "بلژیکی"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "تامیل (طرح Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "بنگالی (طرح Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "بلغاری (تلفظی)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "بلغاری (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "برزیلی (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "بوسنی"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetan"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "بلاروسی"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "سوئیس (طرح آلمانی)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "سوئیس (طرح فرانسوی)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "چک (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "چکی ( qwerty)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "آلمانی"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "آلمانی (بدون کلیدهای مرده)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "دواناگری"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "دانمارکی"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "دوراک (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (اسپرانتو)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (French)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (نروژی)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polish)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "دوراک (سوئدی)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "استونیایی"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "اسپانیایی"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "فنلاندی"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faroese"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "فرانسوی"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "فرانسوی"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "یونانی (چندصوتی)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "یونانی (چندصوتی)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "صفحه‌کلید انگلیسی"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "گرجستانی (طرح \"روسی\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "گرجستانی (طرح \"لاتین\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "یونانی"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "یونانی (چندصوتی)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "گجراتی"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "گورموخی"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "کرواتی"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "مجارستانی"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "ایرلندی"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "اینوک‌تیتوت"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "اسراییلی"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "اسرائیل (تلفظی)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "ایرانی"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "ایسلندی"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "ایتالیایی"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "ژاپنی ۱۰۶ کلیدی"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "کن‌نادا"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "صفحه‌کلید قرقیز"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "صفحه‌کلید کره‌ای"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdish (arabic script)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "آمریکای لاتین"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "لائوسی"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "ایرانی"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "لاتویایی"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "مالای‌الام"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "مقدونیه‌ای"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "مؤنمار (برمه‌ای)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "مغول (سیرلیک)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "مالتی (انگلیس)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "مالتی (آمریکا)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "هلندی"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "نروژی"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "اوری‌یا"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "لهستانی (طرح qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "لهستانی (طرح qwerty)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "پرتغالی"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "کانادایی (کوبک)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "رومانیایی (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "رومانیایی (qwertz)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "رومانیایی (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "روسی"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "روسی (تلفظی)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "سوئدی"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "اسلوونیایی"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "اسلوواکی (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "اسلوواکی (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "سامی (نروژی)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "سام (سوئدی/فنلاندی)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "صربی (سیریلیک)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "سیریاک"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "سیریاک (تلفظی)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "تلوگو"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "تامیل (ISCII-layout)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "تامیل (طرح-ماشین‌نویسی)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "صفحه‌کلید تاجیکی"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmen"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "ترکی (مدل \"Q\" جدید)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "ترکی (مدل \"Q\" جدید)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "اوکراینی"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu keyboard"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "صفحه‌کلید آمریکایی"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "صفحه‌کلید آمریکا (بین‌المللی)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "صفحه‌کلید آمریکا (بین‌المللی)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "ازبک (سیریلیک)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "ویتنامی \"ردیف عددی\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "یوگوسلاو (لاتین)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "کلید راست تبدیل"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "هر دو کلیدهای تبدیل بطور همزمان"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "کلیدهای مهار و تبدیل بطور همزمان"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "کلید قفل‌تبدیل"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "کلیدهای قفل و دگرساز بطور همزمان"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "کلیدهای مهار و دگرساز بطور همزمان"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "کلیدهای دگرساز و تبدیل بطور هم‌زمان"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "کلید \"منو\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "کلید \"ویندوز\" چپ"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "کلید \"ویندوز\" راست"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "هر دو کلیدهای مهار بطور همزمان"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "هر دو کلیدهای دگرساز بطور همزمان"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "کلید تبدیل چپ"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "کلید تبدیل راست"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "کلید دگرساز چپ"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "کلید مهار چپ"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "کلید مهار راست"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1463,12 +1445,12 @@ msgstr ""
 "بین طرح‌های گوناگون صفحه‌کلید تعویض کنید انتخاب کنید\n"
 "(یعنی بین لاتین و غیر لاتین)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "هشدار"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1479,257 +1461,227 @@ msgstr ""
 "در طول نصب، شما باید از کلید راست مهار برای\n"
 "تعویض بین طرحهای مختلف صفحه‌کلید استفاده کنید."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "موشی - Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "استاندارد"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "موشی چرخی PS2 عمومی"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "۱ دکمه"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "موشی ۲ دکمه‌ای عمومی"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "موشی ۳ دکمه‌ای عمومی با شبیه‌سازی چرخ"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "چرخی"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "سریال"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "موشی ۳ دکمه‌ای عمومی"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan با شبیه‌سازی چرخی"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "سیستم‌های موشی"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series با شبیه‌سازی چرخ"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (serial, old C7 type)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (serial, old C7 type) با شبیه‌سازی چرخ"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse با شبیه‌سازی چرخ"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "۲ دکمه‌ای"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "۳ دکمه‌ای"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "۳ دکمه‌ای با شبیه‌سازی چرخ"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "جهانی"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "هر موشی PS/2 & USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "بدون موشی"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "هیچکدام"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "بدون موشی"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "لطفاً نوع موشی خود را انتخاب کنید."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "گزینش دستی"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "شبیه‌سازی دکمه‌ی سوم؟"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "درگاه موشی"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "لطفاً درگاه سریالی را که موشی شما به آن وصل است انتخاب کنید."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "شبیه‌سازی دکمه‌ها"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "شبیه‌سازی دکمه‌ی ۲"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "شبیه‌سازی دکمه‌ی ۳"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "لطفاً موشی را امتحان کنید"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "فعال کردن موشی،"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "چرخ خود را حرکت دهید!"
@@ -1793,6 +1745,52 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "دوراک"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "فرانسوی"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "لهستانی"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "ارمنی"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "موشی - Sun"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "بدون موشی"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "شبیه‌سازی دکمه‌ها"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "شبیه‌سازی دکمه‌ی ۲"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "شبیه‌سازی دکمه‌ی ۳"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "ترکی (مدل \"F\" سنتی)"
 
diff --git a/po/fi.po b/po/fi.po
index 9e916fd..e8fcd6b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11-fi\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2009-10-22 10:31+0300\n"
 "Last-Translator: Jani Välimaa <wally@mandriva.org>\n"
 "Language-Team: Finnish <cooker-i18n@mandrivalinux.org>\n"
@@ -71,22 +71,22 @@ msgstr "32 Mt"
 msgid "64 MB or more"
 msgstr "64 Mt tai enemmän"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X-palvelin"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Valitse X-palvelin"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Usean ulostulon asetukset"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -95,12 +95,12 @@ msgstr ""
 "Järjestelmä tukee usean näytön kokoonpanoa.\n"
 "Mitä tehdään?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Valitse näytönohjaimen muistin määrä"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -111,82 +111,82 @@ msgstr ""
 "toimintoja.\n"
 "Otetaanko se käyttöön?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr "Suljettua ajuria ei oltu asennettu oikein, käytetään vapaata ajuria."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Aseta kaikki näytöt erillisiksi"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Käytä Xinerama-laajennusta"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Aseta vain kortti \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Mukautettu"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Näytönohjaimen ja näytön asetukset"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Lopeta"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Näytönohjain"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Näyttö"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Resoluutio"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Xorg-asetustiedosto on viallinen, tiedosto ohitetaan."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -199,32 +199,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Valitse näyttö ulostulolle #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Valitse näyttö"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Kytke ja käytä"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Yleinen"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Valmistaja"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -247,22 +247,22 @@ msgstr ""
 "virkistystaajuus on suurempi kuin käytössä olevan näytön.\n"
 "Jos olet epävarma, valitse matalampi virkistystaajuus."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Vaakavirkistystaajuus"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Pystyvirkistystaajuus"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Valitse liitännäiset"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -277,7 +277,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -290,83 +290,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 väriä (8 bittiä)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tuhatta väriä (15 bittiä)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tuhatta väriä (16 bittiä)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miljoonaa väriä (24 bittiä)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automaattinen"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Resoluutiot"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Muut"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Valitse resoluutio ja värien määrä"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Näytönohjain: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Ohje"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Kokeile asetuksia"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Kokeillaanko asetuksia?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Varoitus! Näytönohjaimen testaaminen voi kaataa tietokoneen."
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -377,158 +377,163 @@ msgstr ""
 "%s\n"
 "Kokeile muuttaa joitain asetuksia"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Poistutaan %d sekunnin kuluttua"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Ovatko asetukset oikein?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Poista Ctrl-Alt-Backspace käytöstä: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "ei"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "kyllä"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D-laitteistokiihdytys: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Näppäimistön asettelu: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Näppäimistön asettelu: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Hiiren malli: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Näyttö: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Näytön vaakajuovataajuus: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Näytön virkistystaajuus: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Näytönohjain: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafiikkamuisti: %s kt\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Värimäärä: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resoluutio: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg-ajuri: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg-asetukset"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Yleiset asetukset"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Poista Ctrl-Alt-Backspace käytöstä"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Näytönohjaimen lisävalinnat"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Käytä läpikuultavuutta (Composite-laajennus)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Käytä laitteistopohjaista hiiren osoitinta"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Käytä RENDER-kiihdytystä (saattaa aiheuttaa virheitä tekstin näyttämisessä)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Kahdenna kuva erilliseen näyttöön"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Kahdenna kuva toiseen näyttöön"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Pakota DVI-näyttötila"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Käytä BIOS-pikanäppäintä erillisen näytön valintaan"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Käytä EXA:a XAA:n sijaan (parempi Render- ja Composite-suorituskyky)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Graafinen tila käynnistyksessä"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Käynnistä graafinen käyttöliittymä (Xorg) järjestelmän käynnistyessä"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -549,922 +554,899 @@ msgstr ""
 "\n"
 "Löytyykö kortista TV-ulostulo?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Mikä normia televisio käyttää?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "muu"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tšekkiläinen (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Saksalainen"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Espanjalainen"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Suomalainen"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Ranskalainen"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK-näppäimistö"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norjalainen"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Puolalainen"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Venäläinen"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Ruotsalainen"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US-näppäimistö"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanialainen"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenialainen (vanha)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenialainen (kirjoituskone)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenialainen (foneettinen)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabialainen"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Virolainen"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidžanilainen (latinalainen)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgialainen"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (Inscript-järjestys)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (Probhat-järjestys)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgarialainen (foneettinen)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgarialainen (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasilialainen (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnialainen"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkhanlainen / Tiibetiläinen"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Valkovenäläinen"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Sveitsiläinen (saksalainen järjestys)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Sveitsiläinen (ranskalainen järjestys)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Tšekkiläinen (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tšekkiläinen (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Saksalainen"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Saksalainen (ei kuolleita näppäimiä)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Tanskalainen"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (ranskalainen)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (norjalainen)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (puolalainen)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (ruotsalainen)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Virolainen"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Espanjalainen"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Suomalainen"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Färsaarelainen"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Ranskalainen"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Ranskalainen"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Kreikkalainen (polytonic)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Kreikkalainen (polytonic)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK-näppäimistö"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgialainen (\"venäläinen\" järjestys)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgialainen (\"latinalainen\" järjestys)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Kreikkalainen"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Kreikkalainen (polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujaratilainen"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhilainen"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroatialainen"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Unkarilainen"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irlantilainen"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelilainen"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelilainen (foneettinen)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranilainen"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islantilainen"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italialainen"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japanilainen 106-näppäiminen"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgiisialainen"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korealainen"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdilainen (arabialainen kirjoitus)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latinalaisamerikkalainen"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laoslainen"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Liettualainen"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latvialainen"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalamilainen"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonialainen"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmarilainen"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolialainen (kyrillinen)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltalainen (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltalainen (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigerialainen"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Hollantilainen"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norjalainen"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Puolalainen (QWERTY)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Puolalainen (QWERTZ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugalilainen"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadalainen (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romanialainen (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romanialainen (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Romanialainen (QWERTZ)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Venäläinen"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Venäläinen (foneettinen)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Ruotsalainen"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovenialainen"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakialainen (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakialainen (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saamelainen (norjalainen)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saamelainen (ruotsalainen/suomalainen)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbialainen (kyrillinen)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syyrialainen"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syyrialainen (foneettinen)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII-asettelu)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (kirjoituskone-asettelu)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (marokkolainen asettelu)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (foneettinen) (+latinalainen/arabialainen)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajik-näppäimistö"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmenilainen"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turkkilainen (perinteinen \"Q\"-malli)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turkkilainen (perinteinen \"Q\"-malli)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainalainen"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu näppäimistö"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US-näppäimistö"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US-näppäimistö (kansainvälinen)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US-näppäimistö (kansainvälinen)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (US-näppäimistö kolmella näppäintasolla)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbekistanilainen (kyrillinen)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamilainen \"numerorivi\"-QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslavialainen (latinalainen)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Oikea Alt-näppäin"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Molemmat Shift-näppäimet samanaikaisesti"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control- ja Shift-näppäin samanaikaisesti"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock-näppäin"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift- ja CapsLock-näppäin samanaikaisesti"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl- ja Alt-näppäin samanaikaisesti"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt- ja Shift-näppäin samanaikaisesti"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Valikko\"-näppäin"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Vasen \"Windows\"-näppäin"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Oikea \"Windows\"-näppäin"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Molemmat Control-näppäimet samanaikaisesti"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Molemmat Alt-näppäimet samanaikaisesti"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Vasen Shift-näppäin"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Oikea Shift-näppäin"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Oikea Alt-näppäin"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Vasen Control-näppäin"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Oikea Control-näppäin"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1474,12 +1456,12 @@ msgstr ""
 "Voit valita näppäimen tai näppäinyhdistelmän, joka vaihtaa eri\n"
 "näppäimistöasettelujen välillä (esim. latinalainen ja ei-latinalainen)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Varoitus"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1491,258 +1473,228 @@ msgstr ""
 "Control-näppäintä eri näppäimistöasettelujen\n"
 "välillä vaihtamiseen."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Hiiri"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Vakio"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Yleinen PS2-rullahiiri"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 näppäin"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Yleinen 2-näppäiminen hiiri"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Yleinen 3-näppäiminen hiiri rullaemulaatiolla"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rulla"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "sarja"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Yleinen 3-näppäiminen hiiri"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan rullaemulaatiolla"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series rullaemulaatiolla"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (sarja, vanha C7-malli)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (sarja, vanha C7-malli), rullaemulaatiolla"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse rullaemulaatiolla"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "väylähiiri"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 näppäintä"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 näppäintä"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 näppäintä ja rullaemulaatio"
 
 # Asennuksen sivuvalikko
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Yleismalli"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Mikä tahansa PS/2- ja USB-hiiri"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Pakota evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox-hiiri"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware-hiiri"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ei mikään"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Ei hiirtä"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Hiiren kokeileminen"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Valitse hiiren malli"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Hiirivalinta"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emuloi kolmas näppäin?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Hiiren portti"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Mihin sarjaporttiin hiiri on liitetty."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Näppäinemulaatio"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "2. näppäimen emulaatio"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3. näppäimen emulaatio"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Kokeile hiirtä"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Aktivoidaksesi hiiren,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "PYÖRITÄ HIIREN RULLAA!"
@@ -1807,6 +1759,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Ranskalainen"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Puolalainen"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenialainen (vanha)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Hiiri"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox-hiiri"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware-hiiri"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Näppäinemulaatio"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "2. näppäimen emulaatio"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3. näppäimen emulaatio"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Turkkilainen (perinteinen \"F\"-malli)"
 
diff --git a/po/fr.po b/po/fr.po
index 58569f7..0a07179 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-06-15 21:12+0000\n"
 "Last-Translator: Eric Barbero <dune06@free.fr>\n"
 "Language-Team: French (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -64,22 +64,22 @@ msgstr "32 Mo"
 msgid "64 MB or more"
 msgstr "64 Mo ou plus"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "serveur X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Choisissez un serveur d'affichage (serveur X)"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configuration multi-écrans"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -88,13 +88,13 @@ msgstr ""
 "Votre système peut utiliser simultanément plusieurs écrans.\n"
 "Que souhaitez-vous faire ?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr ""
 "Veuillez préciser la quantité de mémoire vidéo de votre carte graphique"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -105,7 +105,7 @@ msgstr ""
 "des fonctionnalités additionnelles.\n"
 "Voulez-vous l'utiliser ?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -114,76 +114,76 @@ msgstr ""
 "Le pilote propriétaire n'a pu être installé correctement, utilisation du "
 "pilote libre par défaut."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configurer les écrans séparément"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Répartir l'affichage sur plusieurs écrans (Xinerama)"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configurer seulement la carte « %s » %s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Configuration de la carte graphique et du moniteur"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Quitter"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Carte graphique"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Moniteur"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Résolution"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Options"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Greffons"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 "Votre fichier de configuration Xorg est invalide, nous allons l'ignorer."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -196,32 +196,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Choisissez un moniteur pour l'écran nº%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Choisissez un moniteur"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Générique"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Vendeur"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -246,22 +246,22 @@ msgstr ""
 "En cas de doute, choisissez un réglage moins performant mais\n"
 "sans risque pour votre matériel."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Fréquence de rafraîchissement horizontal"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Fréquence de rafraîchissement vertical"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Choix des greffons"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -287,7 +287,7 @@ msgstr ""
 "graphique dans l'utilitaire « Configurer le serveur d'affichage » du Centre "
 "de contrôle de Mageia."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -309,83 +309,83 @@ msgstr ""
 "installez le paquet du firmware manuellement ou reconfigurez votre carte "
 "graphique."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 couleurs (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mille couleurs (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mille couleurs (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 millions de couleurs (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Résolutions"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Autre"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Choix de la résolution et de la profondeur des couleurs"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Carte graphique : %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Aide"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Test de la configuration"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Désirez-vous tester la configuration ?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Attention : tester cette carte vidéo peut bloquer votre ordinateur"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -396,161 +396,166 @@ msgstr ""
 "%s\n"
 "Essayez de changer certains paramètres"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Fin dans %d secondes"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "La configuration est-elle correcte ?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Désactiver le Ctrl-Alt-Retour arrière : %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "non"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "oui"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Accélération 3D matérielle : %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposition du clavier : %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Disposition du clavier : %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Type de souris : %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Moniteur : %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Fréquence de synchronisation horizontale : %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Fréquence de rafraîchissement : %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Carte graphique : %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Mémoire vidéo : %s ko\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Profondeur des couleurs : %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Résolution : %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Pilote Xorg : %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Configuration d'Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Options globales"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Désactiver Ctrl-Alt-Retour arrière"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Options de la carte graphique"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Activer la transparence (extension Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Utiliser l'accélération matérielle pour le pointeur de la souris"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Activer l'accélération RENDER (peut causer des anomalies dans l'affichage de "
 "textes)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Activer l'affichage dupliqué sur le moniteur externe"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Activer l'affichage dupliqué sur le second écran"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Forcer le mode d'affichage du DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Activer le basculement d'affichage par la touche de raccourci du BIOS"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 "Utiliser EXA au lieu de XAA (meilleures performances pour Render et "
 "Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Interface graphique lors du démarrage"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Lancement automatique de l'interface graphique (Xorg) au démarrage"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -571,323 +576,266 @@ msgstr ""
 "\n"
 "Avez-vous cette fonction ?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Quelle norme utilise votre téléviseur ?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "autre"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tchèque (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Allemand"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak standard"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Espagnol"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finlandais"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Français"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Anglais (Royaume-Uni)"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norvégien"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polonais"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Russe"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Suédois"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Américain (États-Unis)"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanais"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Arménien (ancien)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Arménien (machine à écrire)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Arménien (phonétique)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabe"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Asturien"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azéri (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belge"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (disposition Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (disposition Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgare (phonétique)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgare (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brésilien (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosniaque"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibétain"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Biélorusse"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Suisse (allemand)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Suisse (français)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabique"
+"Czech (QWERTZ)"
+msgstr "Tchèque (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tchèque (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Allemand"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Allemand (sans touches mortes)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danois"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (Américain)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Français)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (Royaume-Uni)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norvégien)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polonais)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Suédois)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonien"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Espagnol"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finlandais"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Féroïen"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr ""
+"_: clavier\n"
+"Francais (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -896,303 +844,324 @@ msgstr ""
 "_: clavier\n"
 "Francais (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr ""
 "_: clavier\n"
 "Francais (Bepo, seulement latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr ""
+"_: clavier\n"
+"Francais (Bepo, seulement latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Anglais (Royaume-Uni)"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Géorgien (disposition russe)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Géorgien (disposition latine)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grec"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grec (polytonique)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croate"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hongrois"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irlandais"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israélien"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israélien (phonétique)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranien"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandais"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italien"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japonais 106 touches"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirghiz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Coréen"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurde"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latino-américain"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotien"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Lituanien"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Letton"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macédonien"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongole (cyrillique)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltais (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltais (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigérien"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Hollandais"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norvégien"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polonais (QWERTY)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polonais (QWERTZ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugais"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canadien (Québec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Roumain (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Roumain (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1201,154 +1170,161 @@ msgstr ""
 "_: clavier\n"
 "Roumain (basique)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Russe"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Russe (phonétique)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Suédois"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovénien"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Cinghalais"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovaque (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovaque (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norvégien)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (Suédois/Finnois)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbe (cyrillique)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syriaque"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syriaque (phonétique)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telegu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamoul (ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamoul (façon machine à écrire)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thaïlandais (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thaïlandais (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thaïlandais"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (Disposition marocaine)  (+latin/arabe)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (Disposition phonétique)  (+latin/arabe)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadjik"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmène"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1357,7 +1333,7 @@ msgstr ""
 "Clavier\n"
 "Turc (modèle \"F\")"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1366,137 +1342,147 @@ msgstr ""
 "Clavier\n"
 "Turc (modèle \"Q\")"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainien"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Ourdou"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Américain (États-Unis)"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Américain (international)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Américain (international)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (Américain avec 3 niveaux par touche)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Ouzbékistanais (cyrillique)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamien « colonne numérique » QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Yougoslave (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Touche Alt droite"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Deux touches Maj simultanément"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Touches Ctrl et Maj simultanément"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Touche CapsLock (verrouillage majuscule)"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Touches Maj et CapsLock (verrouillage majuscule) simultanément"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Touches Ctrl et Alt simultanément"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Touches Alt et Maj simultanément"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Touche « Menu »"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Touche « Windows » gauche"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Touche « Windows » droite"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Les deux touches Contrôle simultanément"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Les deux touches Alt simultanément"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Touche Majuscule gauche"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Touche Majuscule droite"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Touche Alt gauche"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Touche Contrôle gauche"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Touche Contrôle droite"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1507,12 +1493,12 @@ msgstr ""
 "permettra de commuter entre les différents dispositions de claviers\n"
 "(par exemple : latin et non latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Attention"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1523,257 +1509,227 @@ msgstr ""
 "Pendant l'installation, vous devrez utiliser la touche « Ctrl » droite\n"
 "pour commuter entre les différentes dispositions de clavier."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Souris SUN"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Souris standard PS2 à molette"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 bouton"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Souris standard à 2 boutons"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Souris standard à 3 boutons avec émulation de la molette"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Molette"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "série"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Souris standard à 3 boutons"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan avec émulation de la molette"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series avec émulation de la molette"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Souris Logitech (série, ancien modèle C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Souris Logitech (série, ancien modèle C7) avec émulation de la molette"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse avec émulation de la molette"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "souris bus"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 boutons"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 boutons"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 boutons avec émulation de la molette"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universelle"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "N'importe quelle souris PS/2 ou USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Forcer evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Controlleur Microsoft Xbox S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Souris VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Souris VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "aucun"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Pas de souris"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Test de la souris..."
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Veuillez choisir votre type de souris."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Choix de la souris"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Émuler le troisième bouton ?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Port souris"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Veuillez choisir le port série sur lequel votre souris est connectée."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Émulation des boutons"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Émulation 2e bouton"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Émulation 3e bouton"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Veuillez tester votre souris"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Pour activer la souris,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "VEUILLEZ FAIRE TOURNER LA MOLETTE !"
@@ -1839,3 +1795,51 @@ msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 "Une authentification est nécessaire pour lancer l'outil de configuration de "
 "l'écran de Mageia"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak standard"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Français"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polonais"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Arménien (ancien)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabique"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Souris SUN"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Souris VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Souris VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Émulation des boutons"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Émulation 2e bouton"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Émulation 3e bouton"
diff --git a/po/fur.po b/po/fur.po
index 129af68..5cad73c 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2004-06-28 17:41+0200\n"
 "Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
 "Language-Team: furlan <gft@freelists.org>\n"
@@ -60,34 +60,34 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB o di plui"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Server X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Sielç un server X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Sielç le dimension de memorie de to schede video"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -95,82 +95,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Dopre estension Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configure dome le schede \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personalizât"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Configurazion Xorg"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Jessî"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Schede Grafiche"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Visôr"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Risoluzion"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Prove"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opzions"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -183,32 +183,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Sielç un visôr"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Gjeneric"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -223,22 +223,22 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr ""
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Sielç une azion"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -253,7 +253,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -266,84 +266,84 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 colôrs (8 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mîl colôrs (15 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mîl colôrs (16 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milions di colôrs (24 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Risoluzions"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Altri"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Sielç le risoluzion e le fondece di colôr"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Schedis video: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Va ben"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Scancele"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Jutori"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Prove de configurazion"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Vuelistu provâ le configurazion?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Avertence: le prove di cheste schede grafiche e podares blocâ il to computer"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -354,157 +354,162 @@ msgstr ""
 "%s\n"
 "Prove a cambiâ cualchi parametri"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Ise cheste le impostazion juste?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tastiere"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Sorte di surie: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Visôr: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Schedis grafichis: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memorie de schede video: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Fondece di colôr: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Risoluzion: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Driver Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Configurazion Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Schedis video: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Interface grafiche dal inviament"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -517,922 +522,899 @@ msgid ""
 "Do you have this feature?"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr ""
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr ""
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr ""
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr ""
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr ""
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr ""
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr ""
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr ""
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr ""
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr ""
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr ""
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr ""
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr ""
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr ""
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr ""
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr ""
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr ""
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr ""
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr ""
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Arap"
+"Czech (QWERTZ)"
+msgstr ""
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr ""
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr ""
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr ""
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr ""
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr ""
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr ""
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr ""
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr ""
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr ""
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr ""
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Arap"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Arap"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr ""
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr ""
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr ""
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr ""
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr ""
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr ""
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr ""
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr ""
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr ""
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr ""
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr ""
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr ""
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr ""
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Tastiere"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr ""
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr ""
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr ""
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr ""
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr ""
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr ""
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr ""
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr ""
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr ""
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr ""
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr ""
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr ""
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr ""
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr ""
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr ""
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr ""
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr ""
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr ""
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr ""
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr ""
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr ""
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr ""
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Arap"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr ""
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr ""
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr ""
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr ""
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Arap"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr ""
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr ""
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Arap"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr ""
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr ""
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr ""
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr ""
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1440,12 +1422,12 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Avertence"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1453,257 +1435,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr ""
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr ""
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr ""
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr ""
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr ""
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr ""
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr ""
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr ""
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr ""
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr ""
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr ""
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr ""
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr ""
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr ""
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr ""
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr ""
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr ""
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr ""
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr ""
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr ""
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr ""
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr ""
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr ""
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, fuzzy, c-format
 msgid "Please choose your type of mouse."
 msgstr "Par plasè sielç le to nazion."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "Lenghis"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr ""
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, fuzzy, c-format
 msgid "Mouse Port"
 msgstr "Surie"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr ""
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr ""
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr ""
@@ -1767,6 +1719,18 @@ msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 
 #, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Arap"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Arap"
+
+#, fuzzy
 #~ msgid "Mouse test"
 #~ msgstr "Sorte di surie: %s\n"
 
diff --git a/po/ga.po b/po/ga.po
index 4f64217..e6a9038 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2005-09-12 18:04+0200\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -58,34 +58,34 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB nó níos mó"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X freastalaí"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Roghnaigh freastalaí X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Cumraíochti gach cinn iolrach"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Roghnaigh an méid cuimhne atá id' charta grafachach"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -93,82 +93,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Cumraigh gach cinn ar leith"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Úsáid an síneadh Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Cumraigh an cárta \"%s\"%s amháin"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Socraithe"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Cumraíocht Idirlíon."
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Éalaigh"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Carta Grafach"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Scáileán"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Réiteach"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Tástáil"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Roghnachais"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Breiseáin"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -181,32 +181,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Roghnaigh scáileán"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Roghnaigh scáileán"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Gnáth"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Díoltóir"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -221,22 +221,22 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Ráta athnuachana cothrománach"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Ráta athnuachana ingearach"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Roghnaigh gníomh"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -251,7 +251,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -264,84 +264,84 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 dath (8 giotáin)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 míle dath (15 giotáin)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 míle dath (16 giotáin)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milliún dath (24 giotáin)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Uathoibríoch"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Réiteachaí"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Eile"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Roghnaigh Réiteach agus an méid dath"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Carta Grafach: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ceart go Leor"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "C_úidiú"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Trialaigh an cumraíocht"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Rabhadh: d'fhéadfadh tástáil an chárta ghrafaigh seo do ríomhaire a stopadh"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -349,159 +349,164 @@ msgid ""
 "Try to change some parameters"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Ag fágáil i %d soicind"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "An é seo an socrú ceart?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "Ar bith"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Leagan amach eocharchlára: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Leagan amach eocharchlára: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Cineál luchóg: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Scáileán: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Scáileán HorizSync: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Scáileán VertRefresh: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Carta Grafach: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Cuimhne grafach: %s kb\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Méid dath: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Réiteachaí: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Tiománaí Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Cumraíocht Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Carta Grafach: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X ag tús"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Is féidir linn do ríomhaire a shocrú le X a thosnú i ndhiadh bootáil.\n"
 "An dteastaíonn uait go dtosnófar X nuair a aththosnítear an ríomhaire?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -514,464 +519,416 @@ msgid ""
 "Do you have this feature?"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Cén caighdeán a úsáideann do theilifís?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Ceichís (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Gearmáinis"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spáinis"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Fionlainnais"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francaigh"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Méarchlár UK"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Ioruais"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polainnais"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Ruislís"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Sualannach"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Meárchlár US"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albánach"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr ""
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr ""
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabach"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Eastóinis"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgáiris"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Eilvéis (Stíl Francaigh)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Belgáiris"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgáiris"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgáiris"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr ""
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Boisniach"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Eastóinis"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarúisis"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Eilvéis (Stíl Ghearmánais)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Eilvéis (Stíl Francaigh)"
 
-# AT
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "An Ostair"
+"Czech (QWERTZ)"
+msgstr "Ceichís (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Ceichís (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Gearmáinis"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Gearmáinis (gach meachlár marbh)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr ""
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danmharghais"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (Meiriceá)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Ioruais)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Ioruais)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (Meiriceá)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Ioruais)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Meiriceá)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Meiriceá)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Eastóinis"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spáinis"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Fionlainnais"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faróch"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francaigh"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Francaigh"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Bulgáiris"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Bulgáiris"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Méarchlár UK"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Greicís"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gúisearáitis"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Cróitis"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungárais"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Éireannach"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Ionúitis"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Iosraelach"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Iosraelach (foghrach)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iaránach"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Íoslannach"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Iodálais"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Seápainis (106 eochair)"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Cannadais"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Méarchlár UK"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -979,459 +936,483 @@ msgid ""
 msgstr "Méarchlár Chóiris"
 
 # AT
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "An Ostair"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Mheirceá Theas"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Áit"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Iaránach"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Laitviach"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Mailéalaimis"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maorais"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macadónach"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr ""
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr ""
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr ""
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Ollannach"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Ioruais"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oiríseach"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Polainnais"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portaingéilis"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr ""
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rúisis (Yawerty)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rúisis (Yawerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rúisis (Yawerty)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Ruislís"
+
+#: ../lib/keyboard.pm:277
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Bulgáiris"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Sualannach"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slóivéanach"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slóbaicis (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slóbaicis (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Dvorak (Ioruais)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindis"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Síris"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Bulgáiris"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Teileagúis"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Téalannach (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Meárchlár US"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Téalannach (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Táidsícis"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turcamáinis"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turcamáinis"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turcamáinis"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Úcránach"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Méarchlár Chóiris"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Meárchlár US"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Mearchlár US (idirnaisiúnta)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Mearchlár US (idirnaisiúnta)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr ""
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr ""
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, fuzzy, c-format
 msgid "Left Control key"
 msgstr "Scríos Printéir"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, fuzzy, c-format
 msgid "Right Control key"
 msgstr "Scríos Printéir"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1439,12 +1420,12 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1452,257 +1433,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Luchóg - Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Caighdeánach"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Luchóg MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, fuzzy, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Mouse Gnáth (PS/2)"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 Cnaipe"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Luchóg 2-cnaipe Loiceadh"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, fuzzy, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Luchóg Gnáth 3-cnaipe"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rothar"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "srathach"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Luchóg Gnáth 3-cnaipe"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Luchóg MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, fuzzy, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Luchóg MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Luchóg Logitech CC"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, fuzzy, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Luchóg Logitech CC"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Luchóg Logitech (srathach, séan cinéal C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, fuzzy, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Luchóg Logitech (srathach, séan cinéal C7)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, fuzzy, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 cnaipí"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 cnaipí"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Uilíoch"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Luchóg ar bith"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "Ar bith"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Luchóg ar bith"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Roghnaigh cineál do luiche."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "Rogha Láimhe"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr ""
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Gaireas luchóige"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, fuzzy, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Cén cinéal luchóg atá agat?"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Teastáil an luchóg, le do thoil"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr ""
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "BOG DO ROTHAR!"
@@ -1764,6 +1715,40 @@ msgstr "Cumraíocht Idirlíon."
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francaigh"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polainnais"
+
+# AT
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "An Ostair"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindis"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Luchóg - Sun"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Luchóg ar bith"
+
 #, fuzzy
 #~ msgid ""
 #~ "_: keyboard\n"
diff --git a/po/gl.po b/po/gl.po
index dde4f34..b2354a3 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2014-12-28 15:39+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/mageia/language/"
@@ -65,22 +65,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB ou máis"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Servidor X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Elixa un servidor X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configuración multimonitor"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -89,12 +89,12 @@ msgstr ""
 "O seu sistema soporta configuración multimonitor.\n"
 "Que desexa facer?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Seleccione a cantidade de memoria da súa tarxeta gráfica"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -105,7 +105,7 @@ msgstr ""
 "soportar funcionalidades adicionais.\n"
 "Desexa usalo?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -114,75 +114,75 @@ msgstr ""
 "O driver propietario non foi instalado correctamente, usando o driver libre "
 "por defecto."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configurar tódolas saídas de vídeo independentemente"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Usar a extensión Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configurar só a tarxeta \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Configuración da Tarxeta Gráfica e do Monitor"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Saír"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Tarxeta Gráfica"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Resolución"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Proba"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opcións"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "O seu ficheiro de configuración de Xorg está corrompido, ignorarase."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -195,32 +195,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Escolla un monitor para a saída de vídeo #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Escolla un monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Xenérico"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Vendedor"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -244,22 +244,22 @@ msgstr ""
 "xa que pode danalo.\n"
 "No caso de dúbida, escolla unha configuración conservadora."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Frecuencia de actualización horizontal"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Frecuencia de actualización vertical"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Elixa os plugins"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -284,7 +284,7 @@ msgstr ""
 "driver gráfico indo a \"Configurar o servidor gráfico\" no Centro de Control "
 "de Mageia e re-seleccione a súa tarxeta gráfica"
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -306,83 +306,83 @@ msgstr ""
 "instale o paquete de firmware manualmente ou reconfigure a súa tarxeta "
 "gráfica. "
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 cores (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil cores (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil cores (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 millóns de cores (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Resolucións"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Outros"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Escolla a resolución e a profundidade de cor"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Tarxeta gráfica: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Axuda"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Proba da configuración"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "¿Desexa proba-la configuración?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Advertencia: probar esta tarxeta gráfica pode colgar o ordenador"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -393,157 +393,162 @@ msgstr ""
 "%s\n"
 "Inténteo trocando algún parámetro"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Saíndo en %d segundos"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "É isto correcto?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Desactive Ctrl-Alta-Retroceso: '%s'\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "no"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "si"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Aceleración 3D por hardware: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposición do teclado: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Disposición do teclado: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipo de rato: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Frecuencia horizontal do monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Frecuencia vertical do monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Tarxeta gráfica: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memoria da tarxeta gráfica: %s KB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Profundidade de cor: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolución: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Controlador de Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Configuración de Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Opcions globais"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Desactivar Ctrl-Alt-Retroceso"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opcións da tarxeta gráfica"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Habilitar Translucidez (extensión Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Usar punteiro de rato acelerado por hardware"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Habilitar Aceleración RENDER (pode causar problemas ó amosar texto)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Permitir duplicar a visualización no monitor externo"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Permitir duplicar a visualización na segunda pantalla"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Forzar modo de visualización da DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Habilitar o atallo da BIOS para o cambio externo de monitor"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Usar EXA en troques de XAA (mellor rendemento para Render e Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Lanzar a interface gráfica ó arrincar"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Iniciar automáticamente a interface gráfica (Xorg) ó arrincar"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -564,134 +569,47 @@ msgstr ""
 "\n"
 "Ten esta funcionalidade?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Que norma usa a súa TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "outro"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Checo (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Alemán"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Español"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finlandés"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francés"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Teclado británico"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Noruegués"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polaco"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Ruso"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Sueco"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Teclado estadounidense"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanés"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenio (antigo)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenio (máquina de escribir)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenio (fonético)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Árabe"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -700,788 +618,852 @@ msgstr ""
 "_: teclado\n"
 "Asturianu"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaixaní (latín)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belga"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalí (Disposición Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalí (Disposición Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Búlgaro (fonético)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Búlgaro (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasileiro (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnio"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetano"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Bielorruso"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Suízo (Disposición alemana)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Suízo (Disposición francesa)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cheroqui silábico"
+"Czech (QWERTZ)"
+msgstr "Checo (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Checo (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Alemán"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Alemán (sen teclas acentuadas)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dinamarqués"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (EEUU)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Francés)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (Reino Unido)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Noruegués)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polaco)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Sueco)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonio"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Español"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finlandés"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faroés"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francés"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Francés"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Grego (politónico)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Grego (politónico)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Teclado británico"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Xeorxiano (Disposición \"rusa\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Xeorxiano (Disposición \"latina\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grego"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grego (politónico)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Guxarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croata"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Húngaro"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irlandés"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelí"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelí (Fonético)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iraniano"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandés"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italiano"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Xaponés de 106 teclas"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirguís"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Teclado coreano"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdo (escritura árabe)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latinoamericano"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laosiano"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Lituano"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Letonio"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maorí"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedonio"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Birmania (Birmano)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongol (cirílico)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltés (Reino Unido)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltés (Estadounidense)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nixeriano"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Holandés"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Noruegués"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polaco (disposición qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polaco (disposición qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugués"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canadense (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romanés (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romanés (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Romanés (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Ruso"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Ruso (Fonético)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Sueco"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Esloveno"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Eslovaco (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Eslovaco (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (noruegués)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (sueco/finlandés)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbio (cirílico)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Sirio"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Sirio (fonético)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (disposición ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (disposición de máquina de escribir)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (disposición marroquí) (+latin/árabe)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonético) (+latin/árabe)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Taxik"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turcomán"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ucraíno"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Teclado urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Teclado estadounidense"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Teclado estadounidense (internacional)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Teclado estadounidense (internacional)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (teclado estadounidense con 3 niveis por tecla)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbeco (cirílico)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita \"ringleira de números\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Iugoslavo (latín)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Tecla Alt dereita"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "As dúas teclas Shift simultáneamente"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "As teclas Control e Shift simultáneamente"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Tecla BloqMayús (CapsLock)"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Teclas Shift e BloqMayús (CapsLock) simultáneamente"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Teclas Ctrl e Alt simultáneamente"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Teclas Alt e Shift simultáneamente"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Tecla \"Menú\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Tecla \"Windows\" esquerda"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Tecla \"Windows\" dereita"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "As dúas teclas Control simultáneamente"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "As dúas teclas Alt simultáneamente"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Tecla Shift esquerda"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Tecla Shift dereita"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Tecla Alt esquerda"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Tecla Control esquerda"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Tecla Control dereita"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1492,12 +1474,12 @@ msgstr ""
 "permitirán cambir entre as diferentes disposicións de teclado\n"
 "(p.ex: latin e non latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1508,257 +1490,227 @@ msgstr ""
 "Durante a instalación, terá que usar a tecla Control dereita\n"
 "para cambiar entre as diferentes disposicións de teclado."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Rato Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Estándar"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Rato de Roda PS2 Xenérico"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 botón"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Rato de 2 Botóns Xenérico"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Rato de 3 Botóns Xenérico con Emulación da Roda"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Roda"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serie"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Rato de 3 Botóns Xenérico"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan con Emulación da Roda"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series con Emulación da Roda"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Rato Logitech (serie, antigo tipo C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Rato Logitech (serie, antigo tipo C7) con Emulación da Roda"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse con Emulación da Roda"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 botóns"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 botóns"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 botóns con emulación da roda"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Calquera rato PS/2 & USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Forzar evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Rato de VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Rato VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ningún"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Ningún rato"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Probando o rato"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Escolla o seu tipo de rato."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Escolla do rato"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "¿Emula-lo terceiro botón?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Porto do Rato"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Por favor, escolla o porto serie onde está conectado o seu rato."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulación de botóns"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulación do Botón 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulación do Botón 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Probe o seu rato"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Para activa-lo rato,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "¡MOVA A RODA!"
@@ -1819,3 +1771,51 @@ msgstr "Arrincar a Configuración Gráfica de Mageia"
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 "Requirese autenticación para arrincar a Configuración Gráfica de Mageia"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francés"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polaco"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenio (antigo)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cheroqui silábico"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Rato Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Rato de VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Rato VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulación de botóns"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulación do Botón 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulación do Botón 3"
diff --git a/po/he.po b/po/he.po
index 001a14e..4daa0a9 100644
--- a/po/he.po
+++ b/po/he.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2014-12-28 15:39+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/mageia/language/"
@@ -69,22 +69,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB או יותר"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "שרת גרפי"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "יש לבחור כרטיס מסך"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "הגדרת מספר צגים"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -93,12 +93,12 @@ msgstr ""
 "המערכת שלך תומכת בהגדרת מספר צגים.\n"
 "מה ברצונך לעשות?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "עליך לבחור את כמות הזיכרון של כרטיס המסך שלך"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -108,82 +108,82 @@ msgstr ""
 "התקן הנע קניני זמין לכרטיס הוידאו שלך ויתכן כי הוא תומך באפשרויות נוספות.\n"
 "האם ברצונך להשתמש בו?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr "התקן ההנע הקניני לא הותקן כיאות, משתמש בהתקן ההנע החופשי."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "הגדרת כל הצגים בנפרד"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "השתמש בהרחבת Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "הגדר רק את הכרטיס \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "מותאם אישית"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "הגדרת כרטיס מסך וצג"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "יציאה"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "כרטיס גרפי"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "מסך"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "הפרדת מסך"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "בדיקה"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "אפשרויות"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "תוספים"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "הגדרות השרת הגרפי Xorg שלך אינן תקינות, ולכן לא נתייחס אליהן."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -196,32 +196,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "בחירת צג למסך #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "יש לבחור מסך"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "הכנס-הפעל"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "כללי"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "יצרן"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -243,22 +243,22 @@ msgstr ""
 "ליכולות המסך שלך מאחר והדבר עלול לגרום נזק למסך. אם\n"
 "המידע לא ידוע, עליך לבחור בתצורה זהירה ובסיסית יותר."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "קצב רענון אופקי"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "קצב רענון אנכי"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "בחירת תוספים"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -273,7 +273,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -286,83 +286,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 צבעים (8 סיביות)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 אלף צבעים (15 סיביות)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 אלף צבעים (16 סיביות)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 מיליון צבעים (24 סיביות)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "אוטומטי"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "הפרדות מסך"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "אחר"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "נא לבחור את הפרדת המסך ועומק הצבע"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "כרטיס מסך: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "אישור"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "ביטול"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "עזרה"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "בדיקת התצורה"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "האם ברצונך לבדוק את ההגדרות?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "אזהרה: בדיקת כרטיס המסך הזה עלולה לתקוע לך את המחשב"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -373,157 +373,162 @@ msgstr ""
 "%s\n"
 "יש לנסות לשנות מספר פרמטרים"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "הבדיקה תסתיים בעוד %d שניות"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "האם ההגדרות תקינות?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "לא"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "כן"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "האצה תלת-מימדית בחומרה: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "פרישת מקלדת: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "פרישת מקלדת: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "סוג עכבר: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "מסך: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "רענון אופקי של המסך: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "רענון אנכי של המסך: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "כרטיס מסך: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "זיכרון כרטיס מסך: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "עומק צבע: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "הפרדת מסך: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "מנהל התקן Xorg %s: \n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "הגדרות Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "אפשרויות כרטיס מסך"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "אפשר שקיפות (הרחבת Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "השתמש בהאצה בחומרה עבור מצביע העכבר"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "אפשר האצה בעזרת RENDER (עלול ליצור בעיות בתצוגת טקסט)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "אפשר תצוגה מוכפלת בצג החיצוני"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "אפשר תצוגה מוכפלת על הצג השני"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "אפשר את מקש ה-BIOS להפעלת לצג החיצוני"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "השתמש ב-EXA במקום ב-XAA (ביצועים טובים יותר ל-Render ו-Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "הפעלת מנשק גרפי באתחול המחשב"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "הפעל את המנשק הגרפי (Xorg) באופן אוטומטי באתחול"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -543,922 +548,899 @@ msgstr ""
 "\n"
 "האם ברצונך להגדיר אפשרות זו?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "באיזה תקן שידור הטלוויזיה שלך משתמשת?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "אחר"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "צ'כית (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "גרמנית"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "ספרדית"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "פינית"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "צרפתית"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "מקלדת אנגלית"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "נורבגית"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "פולנית"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "רוסית"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "שוודית"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "מקלדת ארה\"ב"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "אלבנית"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "ארמנית (ישן)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "ארמנית (מכונות כתיבה)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "ארמנית (פונטית)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "ערבית"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr ""
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "אזרביג'אן (לטינית) "
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "בלגית"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "בנגאלי (Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "בנגאלי (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "בולגרית (פונטית)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "בולגרית (BSD)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "ברזילאית (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "בוסנית"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "טיבטית"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "בלרוסית"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "שוויץ (פריסה גרמנית)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "שווייץ (פריסה צרפתית)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "הברות צ'ירוקיות"
+"Czech (QWERTZ)"
+msgstr "צ'כית (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "צ'כית (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "גרמנית"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "גרמנית (ללא מקשים מתים)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "דנית"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "דבורק (ארה\"ב)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "דבורק (אספרנטו)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "דבורק (צרפתית)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "דבורק (בריטניה)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "דבורק (נורבגית)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "דבורק (שבדית)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "דבורק (שבדית)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "אסטונית"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "ספרדית"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "פינית"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "פארואס"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "צרפתית"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "צרפתית"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "יוונית (פוליטונית)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "יוונית (פוליטונית)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "מקלדת אנגלית"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "גגורג'יאנית (פריסה \"רוסית\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "גורג'יאנית (פריסה \"לטינית\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "יוונית"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "יוונית (פוליטונית)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "גורמוקי"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "קרואטית"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "הונגרית"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "אירי"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "אינוקטיטוט"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "מקלדת ישראלית (רגילה)"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "מקלדת ישראלית (פונטית)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "אירנית"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Icelandic"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "איטלקית"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "יפנית 106 תווים"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "מקלדת קירגיזית"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "מקלדת קוריאנית"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "קורדית (כתב ערבי)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "אמריקה הלטינית"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotian"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "לאטוויה"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "מאורי"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "מקדונית"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "מוגולית (קירילית)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "מלטה (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "מלטה (ארה\"ב)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "ניגרי"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "צ'כית"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "נורבגית"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "אוריה"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "פולנית (פרישת qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "פולנית (פרישת qwetrz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "פשטו"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "פורטוגזית"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "קנדית (קויבק)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "רומנית (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "רומנית (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "רומנית (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "רוסית"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "רוסית (פונטית)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "שוודית"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "סלובנית"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "סינהלה"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "סלובקית (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "סלובקית (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "סאמי (נורבגית)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (swedish/finnish)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "סינדי"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "סרבית (קרילית)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "סוריה"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "סורית (פונטית)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "טאלוגו"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII-layout)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (Typewriter-layout)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "תאילנדית (קדמני)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "תאילנדית (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "תאילנדית (פטאצ'וטה)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "טיפינג (פריסה מרוקאית) (+לטינית/ערבית)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "טיפינג (פונטית) (+לטינית/ערבית)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajik"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "טורקמנית"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "אוקראינית"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "אורדו"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "מקלדת ארה\"ב"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "מקלדת ארה\"ב (בינלאומית)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "מקלדת ארה\"ב (בינלאומית)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (מקלדת ארה\"ב עם 3 רמות למקש)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbek (cyrillic)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "וייטנמית \"מספרים בשורה\"  QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "יוגוסלבית (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "מקש Alt הימני"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "שני מקשי ה-Shift בו זמנית"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "מקשי Ctrl ו-Shift בו-זמנית"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "מקש CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "מקשי Shift ו-CapsLock בו זמנית"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "מקשי Ctrl ו-Alt בו זמנית"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "מקשי Alt ו-Shift בו זמנית"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "מקש \"תפריט\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "מקש \"חלונות\" השמאלי"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "מקש \"חלונות\" הימני"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "שני מקשי ה-Control בו זמנית"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "שני מקשי ה-Alt בו זמנית"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "מקש Shift השמאלי"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "מקש Shift הימני"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "מקש Alt השמאלי"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "מקש Control השמאלי"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "מקש Control הימני"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1468,12 +1450,12 @@ msgstr ""
 "בשלב זה עליך לבחור את שילוב המקשים שיאפשר לך להחליף\n"
 "בין פריסות מקלדת שונות שהגדרת, ואשר מייצגות שפות שונות:"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "אזהרה"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1484,257 +1466,227 @@ msgstr ""
 "תופעל רק לאחר ההתקנה. במהלך ההתקנה עצמה,\n"
 "מקש Control הימני משמש להחלפת פרישת מקלדת."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "עכבר - Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "רגיל"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "עכבר PS2 כללי עם גלגלת"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "העכבר החושב של Kensington"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "כפתור אחד"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "עכבר כללי עם 2 מקשים"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "עכבר כללי עם שלוש כפתורים והדמיית גלגלת"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "עם גלגלת"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "טורי"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "עכבר כללי עם 3 מקשים"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan עם הדמיית גלגלת"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series עם הדמיית גלגלת"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "עכבר Logitech (טורי, מסוג C7 ישן)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "עכבר Logitech (טורי, מסוג C7 ישן), עם הדמיה של גלגלת"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "עכבר Thinking Mouse של Kensington עם הדמיית גלגלת"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 כפתורים"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 כפתורים"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "שלושה כפתורים עם הדמיית גלגלת"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "אוניברסלי"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "כל עכבר PS/2 ו-USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "הכרח evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "שלט מדגם S ל-Xbox של מיקרוסופט"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "עכבר של וירטואלבוקס"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "כלום"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "ללא עכבר"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "בודק את העכבר"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "נא לבחור את סוג העכבר"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "בחירת עכבר"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "האם לדמות כפתור שלישי?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "ממשק העכבר"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "נא לבחור לאיזה יציאה טורית העכבר שלך מחובר"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "הדמיית כפתורים"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "הדמיית כפתור 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "הדמיית כפתור 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "בדיקת הגדרות העכבר"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "יש לבדוק את תנועת העכבר,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "וכן את הלחצנים והגלגלת (אם ישנה)."
@@ -1792,3 +1744,48 @@ msgstr ""
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "צרפתית"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "פולנית"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "ארמנית (ישן)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "הברות צ'ירוקיות"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "סינדי"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "עכבר - Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "עכבר של וירטואלבוקס"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "הדמיית כפתורים"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "הדמיית כפתור 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "הדמיית כפתור 3"
diff --git a/po/hi.po b/po/hi.po
index d40afd0..c0873c5 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2018-05-21 17:08+0000\n"
 "Last-Translator: Panwar108 <caspian7pena@gmail.com>\n"
 "Language-Team: Hindi (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -63,22 +63,22 @@ msgstr "३२ एम०बी०"
 msgid "64 MB or more"
 msgstr "६४ मेगाबाईट और अधिक"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "एक्स सर्वर"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "एक एक्स सर्वर का चयन करें"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "बहु-शीर्ष संरचना"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -87,12 +87,12 @@ msgstr ""
 "आपका तंत्र बहु शीर्ष संरचना का समर्थन करता है ।\n"
 "आप क्या करना चाहते है ?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "अपने ग्राफ़िक्स कार्ड के स्मृति आकार का चयन करें"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -100,82 +100,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "सभी शीर्षों की स्वतंत्रता-पूर्वक संरचना"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "ज़ाइनरामा (Xinerama) विस्तार का उपयोग"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "\"%s\"%s कार्ड को सिर्फ़ संरचित"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "इच्छानुसार"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "निकास"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "ग्राफ़िक्स कार्ड"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "मॉनीटर"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "विश्लेषण (रेजॅल्यूशन)"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "परीक्षण"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "विकल्पों"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "प्लगइन्स"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -188,32 +188,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "एक मॉनिटर का चयन करें"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "प्लग और प्ले"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "सामान्य"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "विक्रेता"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -236,22 +236,22 @@ msgstr ""
 "जो कि आपके मॉनिटर की क्षमता से बाहर हो: आप अपनेमॉनिटर को नष्ट कर सकते है।\n"
 " यदि संदेह हो, तो एक थोड़ी कम समायोजना का चयन करें ।"
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "क्षैतिज ताजा की दर"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "वर्टिकल ताजा करने की दर"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -266,7 +266,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -279,83 +279,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "२५६ रंग (८ बिट्स)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "३२ हज़ार रंग (१५ बिट्स)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "६५ हज़ार रंग (१६ बिट)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "१६ मिलयन रंग (२४ बिट्स)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "स्वचालित"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "रेजॅल्यूशनों के प्रकार"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "अन्य"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "रंग की गहराई और रेजॅल्यूशन का चयन करें"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "ग्राफ़िक्स कार्ड: %s "
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "ठीक"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "निरस्त"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "सहायता"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "संरचना का परीक्षण"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "क्या आप इस संरचना का परीक्षण करना चाहते है?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "चेतावनी: इस ग्राफ़िक्स कार्ड का परीक्षण आपके कम्प्यूटर को जड़ कर देगा"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -366,157 +366,162 @@ msgstr ""
 "%s\n"
 "कुछ पैरामीटरों को परिवर्तित करने का प्रयास करें"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d क्षणों में निकला जा रहा है"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "क्या यह समायोजन सही है ?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "की०बोर्ड खाका: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "की०बोर्ड खाका: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "माउस का प्रकार: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "मॉनिटर: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "मॉनिटर की क्षैतिज एकसारीकरण दर: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "मॉनिटर की वर्टिकल ताजा करने की दर: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "ग्राफ़िक्स कार्ड: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "ग्राफ़िक्स स्मृति: %s के०बी०\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "रंग की गहराई: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "रेजॅल्यूशन: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "एक्सफ़्री-८६ चालक: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "एक्स-फ़्री संरचना"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "आरम्भ में संचित्र इन्टरफ़ेस"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -537,922 +542,899 @@ msgstr ""
 "\n"
 "क्या आपके पास यह सुविधा है?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "आपका टीवी किस मानक का उपयोग कर रहा है?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Czech (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "जर्मन"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "स्पेनिश"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finnish"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "फ़्रेंच"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "ब्रिटिश की-बोर्ड"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norwegian"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "पोलिस"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "रूस"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "स्वीडिश"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "यूएस की-बोर्ड"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "अलबेनिया"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "अर्मेनिया (प्राचीन)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "अर्मेनिया (टाइप-रायटर)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "आरमेनियन (फ़ोनेटिक) "
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "अरबी"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr ""
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgian"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "बागँला (Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "बागँला (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "बुल्गारिया (फ़ोनोटिक)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgarian (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazilian (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnian"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr ""
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarusian"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "स्वीस (जर्मन खाका)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "स्वीस (फ़्रेंच खाका)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr ""
+"Czech (QWERTZ)"
+msgstr "Czech (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Czech (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "जर्मन"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "जर्मन (कोई मृत कुँजिया नहीं)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "देवनागरी"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "डेनिस"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr ""
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr ""
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr ""
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norwegian)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Swedish)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonian"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "स्पेनिश"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finnish"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr ""
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "फ़्रेंच"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr ""
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
-msgstr ""
+"French (Bepo latin9)"
+msgstr "Greek (polytonic)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Polish (qwerty layout)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "ब्रिटिश की-बोर्ड"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgian (\"Russian\" layout)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgian (\"Latin\" layout)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "ग्रीक"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Greek (polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "गुजराती"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "गूरमुखी"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croatian"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hungarian"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irish"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israeli"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "इजरायल (फ़ोनेटिक)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "इरानी"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Icelandic"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "इटैलियन"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "जापानी १०६ कुँजियां"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr ""
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "कोरियन की-बोर्ड"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr ""
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "लैटिन अमेरिका"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotian"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latvian"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "मलयालम"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedonian"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolian (cyrillic)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltese (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltese (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "डच"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norwegian"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "उड़ीया"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polish (qwerty layout)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polish (qwertz layout)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr ""
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "पुर्तगाली"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "कैनैडियन (क्य़ूबैक)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romanian (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romanian (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "रूस"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "रशियन (फ़ोनेटिक)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "स्वीडिश"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovenian"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakian (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakian (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norwegian)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (swedish/finnish)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr ""
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbian (cyrillic)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "सीरीया"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "सीरिया (फ़ोनोटिक)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "तेलगु"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "तमिल (आईएससीआईआई-खाका)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "तमिल (टंकण-खाका)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr ""
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr ""
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr ""
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "ताज़िक् की-बोर्ड"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr ""
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainian"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr ""
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "यूएस की-बोर्ड"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "अमेरिकी की-बोर्ड (अन्तरराष्ट्रीय)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "अमेरिकी की-बोर्ड (अन्तरराष्ट्रीय)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbek (cyrillic)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamese \"numeric row\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Yugoslavian (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "दांयी आल्ट (Alt) कुंजी"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "दोनों स्फ़िट कुँजियों को साथ-साथ"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "कन्ट्रोल और स्फ़िट कुँजियों को एक साथ"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "कैप्सलॉक कुँजी"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "कन्ट्रोल (Ctrl) और आल्ट (Alt)  कुँजियों को साथ-साथ"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "आल्ट और सीफ़्ट कुँजियों को साथ-साथ "
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"मीनू\" कुँजी"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "बायीं \"विण्डो\" कुंजी"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "दायीं \"विण्डो\" कुँजी"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "दोनों कन्ट्रोल कुँजियां साथ-साथ"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "दोनों आल्ट (Alt) कुँजियां साथ-साथ"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "दाँयी स्फ़िट कुँजी"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "दायीं स्फ़िट कुँजी"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "दाँयी आल्ट कुँजी"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "बांयी कन्ट्रोल कुँजी"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "दायीं कन्ट्रोल कुँजी"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1463,12 +1445,12 @@ msgstr ""
 "विभिन्न की-बोर्ड खाकों (जैसे कि लैटिन और अ-लैटिन) के मध्य\n"
 "इधर-से-उधर जाने की अनुमति प्रदान करेगें"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "चेतावनी"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1479,257 +1461,227 @@ msgstr ""
 "संसाधन के दौरान, आप विभिन्न की-बोर्ड खाकों के मध्य\n"
 "इधर-से-उधर जाने के लिए दाँयी कन्ट्रोल कुँजी के उपयोग की आवश्यकता होगी।"
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "सन - माउस"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "सामान्य"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "लॉजीटेक्क माउसमैन+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "सामान्य पीएस-२ व्हील माउस"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "ग्लाइड बिन्दु"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "केन्सिंगटन सोचनेवाला माउस"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "जेनिस नेटमाउस"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "जेनिस नेटस्क्रोल"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "माइक्रोसॉफ़्ट एक्सप्लोरर"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "१ बटन"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "सामान्य २ बटन वाला माउस"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "सामान्य ३ बटन वाला माउस व्हील ऐम्यूलेशन के साथ"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "व्हील"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "क्रमिक (सीरीयल)"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "३-बटन वर्ग माउस"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "माइक्रोसॉफ़्ट इंटेलीमाउस"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "लॉजिटेक्क माउसमैन"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "व्हील ऐम्यूलेशन के साथ लॉजीटेक्क माउसमैन"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "माउस प्रणालियां"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "लॉजीटेक्क सीसी श्रंखला"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "लॉजीटेक्क सीसी श्रंखला व्हील ऐम्यूलेशन के साथ"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "लॉजीटेक्क माउसमैन+/फ़र्स्टमाऊस+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "एम०एम० श्रंखला"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "एम०एम० हिट टैबलेट"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "लॉजीटेक्क माउस (सीरीयल, प्राचीन सी-७ प्रकार)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "लॉजीटेक्क माउस (सीरीयल, प्राचीन सी-७ प्रकार) व्हील ऐम्यूलेशन के साथ"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "केन्सिंगटन सोचनेवाला माउस व्हील ऐम्यूलेशन के साथ"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "बस-माउस"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "२ बटन"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "३ बटन"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "३ बटन व्हील ऐम्यूलेशन के साथ"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "विश्वव्यापी"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "कोई भी पीएस/२ व यूएसबी माउस"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr ""
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "कुछ भी नहीं"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "कोई माउस नहीं"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "कृपया अपने माउस के प्रकार का चयन करें"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr ""
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "तीसरे बटन को एम्यूलेट करा जायें ?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "माउस पोर्ट"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "कृपया उस सीरियल पोर्ट का चयन करें जिससे आपका माउस जुड़ा हुआ है ।"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "बटनों का ऐम्यूलेशन"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "२ बटन ऐम्युलेशन"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "३ बटन ऐम्युलेशन"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "कृपया माउस का परीक्षण करें"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "माउस को सक्रिय करने के लिए,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "अपने व्हील को चलायें"
@@ -1787,3 +1739,30 @@ msgstr ""
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "पोलिस"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "अर्मेनिया (प्राचीन)"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "सन - माउस"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "बटनों का ऐम्यूलेशन"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "२ बटन ऐम्युलेशन"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "३ बटन ऐम्युलेशन"
diff --git a/po/hr.po b/po/hr.po
index 5f7fc3e..60d9a90 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2017-09-19 17:26+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Croatian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -63,34 +63,34 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB ili više"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X poslužitelj"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Izaberite X poslužitelj"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Više-zaslonska postava"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Odaberite količinu memorije na grafičkoj kartici"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -98,82 +98,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Podesi sve zaslone nezavisno"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Koristi Xinerama proširenje"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Konfiguriraj samo karticu  \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Prilagođeno"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Konfiguracija grafičke kartice & monitora"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Izlaz"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafička kartica"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Zaslon"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Rezolucija"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Odrednice"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Dodaci"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -186,32 +186,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Odaberite monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generički"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Proizvođač"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -236,22 +236,22 @@ msgstr ""
 "veći od mogućnosti vašeg monitora jer možete oštetiti vaš monitor.\n"
 " Ukoliko ste u nedoumici, izaberite konzervativne postavke."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horizontalna vrijednost osvježavanja"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikalna vrijednost osvježavanja"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Izaberite priključke"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -266,7 +266,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -279,84 +279,84 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 boja (8 bita)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tisuća boja (15 bita)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tisuća boja (16 bita)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milijuna boja (24 bita)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatski"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Rezolucije"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Ostalo"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Odaberite rezoluciju  i color depth"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafička kartica: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Iskušaj postavu"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Da li želite iskušati postavu ?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Upozorenje: testiranje ove grafičke kartice može zamrznuti vaše računalo"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -367,157 +367,162 @@ msgstr ""
 "%s\n"
 "Probajte promjeniti parametre"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Zatvaram nakon %d sekundi"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Da li je ovo ispravno?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Onemogući Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "ne"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "da"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D ubrzanje sklopovlja: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Raspored tipkovnice: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Raspored tipkovnice: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Vrsta miša: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Horizontalna Sinkronizacija Monitora: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Vertikalno Osvježenje Monitora: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafička kartica: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafička memorija: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Dubina boje: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rezolucija: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg upravljački program: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg postavke"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Globalne opcije"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Onemogući Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opcije grafičke kartice"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X kod pokretanja sustava"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -530,162 +535,75 @@ msgid ""
 "Do you have this feature?"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Koju normu koristi vaš TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Češka (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Njemačka"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Španjolska"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finska"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francuska"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK tipkovnica"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norveška"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Poljska"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Ruska"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Švedska"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US tipkovnica"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanska"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenska (stara)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenska (pisaća mašina)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenska (fonetska)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabsko"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr ""
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbejdžanska (latinica)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgijska"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -694,28 +612,28 @@ msgstr ""
 "_: tipkovnica\n"
 "Bengali (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bugarska (fonetska)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bugarska (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazilska (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -724,7 +642,7 @@ msgstr ""
 "_: tipkovnica\n"
 "Bosanska"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -733,49 +651,56 @@ msgstr ""
 "_: tipkovnica\n"
 "Dzongkha/Tibetan"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Bjeloruska"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Švicarska (Njemački raspored)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Švicarska (francuski raspored)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr ""
+"Czech (QWERTZ)"
+msgstr "Češka (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Češka (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Njemačka"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Njemačka (bez mrtvih tipaka)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -784,21 +709,21 @@ msgstr ""
 "_: tipkovnica\n"
 "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danska"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (USA)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -807,7 +732,7 @@ msgstr ""
 "_: tipkovnica\n"
 "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -816,7 +741,7 @@ msgstr ""
 "_: tipkovnica\n"
 "Dvorak (francuski)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -825,14 +750,14 @@ msgstr ""
 "_: tipkovnica\n"
 "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norveška)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -841,77 +766,110 @@ msgstr ""
 "_: tipkovnica\n"
 "Dvorak (poljski)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Švedska)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonska"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Španjolska"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finska"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr ""
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francuska"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr ""
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
-msgstr ""
+"French (Bepo latin9)"
+msgstr "Francuska"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Poljska (qwerty raspored)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK tipkovnica"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gruzijska  (\"Ruski\" raspored)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gruzijska  (\"Latin\" raspored)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grčka"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr ""
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -920,21 +878,21 @@ msgstr ""
 "_: tipkovnica\n"
 "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Hrvatska"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Mađarska"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -943,7 +901,7 @@ msgstr ""
 "_: tipkovnica\n"
 "irska"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -952,49 +910,49 @@ msgstr ""
 "_: tipkovnica\n"
 "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Izraelska"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Izraelska (fonetska)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranska"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandska"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Talijanska"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japanska (106 tipaka)"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1003,42 +961,42 @@ msgstr ""
 "_: tipkovnica\n"
 "Kanada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr ""
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korejska tipkovnica"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr ""
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latino američka"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr ""
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1047,21 +1005,21 @@ msgstr ""
 "_: tipkovnica\n"
 "litvanska"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latvija"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr ""
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1070,21 +1028,21 @@ msgstr ""
 "_: tipkovnica\n"
 "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonska"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr ""
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1093,7 +1051,7 @@ msgstr ""
 "_: tipkovnica\n"
 "mongolska (ćirilica)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1102,7 +1060,7 @@ msgstr ""
 "_: tipkovnica\n"
 "malteška (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1112,7 +1070,7 @@ msgstr ""
 "malteška (US)\n"
 " "
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1121,368 +1079,392 @@ msgstr ""
 "_: tipkovnica\n"
 "nigerijska"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Nizozemska"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norveška"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr ""
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Poljska (qwerty raspored)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Poljska (qwertz raspored)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr ""
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugalska"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadska (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumunjska (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumunjska (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Ruska"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Ruska (fonetska)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Švedska"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovenska"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovačka (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovačka (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr ""
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr ""
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Srpska (čirilica)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr ""
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr ""
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr ""
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr ""
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr ""
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajik tipkovnica"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr ""
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrajinska"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr ""
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US tipkovnica"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US keyboard (internacionalna)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US keyboard (internacionalna)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vijetnamska \"numeric row\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslavenska (latinična)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Desna Alt tipka"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Obe Shift tipke istodobno"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control i Shift tipke istodobno"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock tipka"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl i Alt tipke istodobno"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt i Shift tipku istodobno"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\" tipka"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Lijeva \"Windows\" tipka"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Desna \"Windows\" tipka"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Istodobno obje Control tipke"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Istodobno obje Alt tipke"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr ""
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr ""
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1493,12 +1475,12 @@ msgstr ""
 "omogućiti prebacivanje između različitih rasporeda tipkovnica\n"
 "(npr: latin i ne-latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1506,257 +1488,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - miš"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standardno"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Generički PS2 miš s kotačićem"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 gumb"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Generički miš s 2 gumba"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Kotačić"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serijski"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Generički miš s 3 gumba"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC serije"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Serije"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Miš (serijski, stara C7 vrsta)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmiš"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 gumba"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 gumba"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Univerzalno"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Bilo koji PS/2 ili USB miš"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr ""
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox miš"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware miš"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ništa"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Nema miša"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Testiranje miša"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Molim izaberite vašu vrstu miša."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Izbor miša"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emuliranje treće tipke?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Port miša"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Izaberite na kojem serijskom portu je miš priključen."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulacija gumbova"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulacija 2 gumba"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulacija 3 gumba"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Molimo istestirajte miša."
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Za aktiviranje miša,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "POMAKNITE VAŠ KOTAČIĆ!"
@@ -1814,3 +1766,36 @@ msgstr ""
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Poljska"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenska (stara)"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - miš"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox miš"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware miš"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulacija gumbova"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulacija 2 gumba"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulacija 3 gumba"
diff --git a/po/hu.po b/po/hu.po
index 7858f2b..b1a27be 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2017-04-12 18:33+0000\n"
 "Last-Translator: Laszlo Espadas <kardiweb@protonmail.ch>\n"
 "Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -66,22 +66,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB vagy több"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X kiszolgáló"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Válasszon egy X kiszolgálót"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "A többképernyős mód beállítása"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -90,12 +90,12 @@ msgstr ""
 "A grafikus kártya lehetővé teszi több képernyő használatát.\n"
 "Mit szeretne tenni?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Válassza ki a grafikus kártyán található memória mennyiségét"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -106,7 +106,7 @@ msgstr ""
 "esetleg további funkciókat támogathat.\n"
 "Szeretné azt használni?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -116,75 +116,75 @@ msgstr ""
 "ezért az alapértelmezés szerinti szabad szoftveres meghajtóprogram lesz "
 "használva."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "A képernyők egymástól független beállítása"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "A Xinerama kiterjesztés használata"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Csak a(z) \"%s\"%s kártya beállítása"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Egyéni"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "A grafikus kártya és a monitor beállítása"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Kilépés"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafikus kártya"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Felbontás"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Teszt"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Beállítások"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Bővítőmodulok"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Az Xorg beállítási fájlja hibás, ezért figyelmen kívül lesz hagyva."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -197,32 +197,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Válasszon monitort ehhez a képernyőhöz: #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "A monitor kiválasztása"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug and Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Általános"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Gyártó"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -245,22 +245,22 @@ msgstr ""
 "Ha nem ismeri a monitor jellemzőit, válasszon egy biztonságosan\n"
 "alacsony értéket!"
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Vízszintes frissítés"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Függőleges frissítés"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Válasszon bővítőmodulokat"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -285,7 +285,7 @@ msgstr ""
 "csomagforrást \"A csomagok telepítése és törlése\"-nél. Majd a Mageia "
 "Beállítóközpontban a  grafikus meghajtó újrakonfigurálásával."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -306,85 +306,85 @@ msgstr ""
 "csomagforrást \"A csomagok telepítése és törlése\"-nél. Majd a Mageia "
 "Beállítóközpontban a  grafikus meghajtó újrakonfigurálásával."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 szín (8 bites)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 ezer szín (15 bites)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 ezer szín (16 bites)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 millió szín (24 bites)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatikus"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Felbontások"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Egyéb"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Válassza ki a felbontást és a színmélységet"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafikus kártya: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Mégsem"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Segítség"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "A beállítások kipróbálása"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Ki szeretné próbálni a beállításokat?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Figyelmeztetés: a grafikus kártya tesztelése esetleg a gép lefagyásához is "
 "vezethet."
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -395,161 +395,166 @@ msgstr ""
 "%s\n"
 "Módosítson néhány paramétert."
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Kilépés %d másodperc múlva"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Elfogadja a beállítást?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Ctrl-Alt-Backspace letiltása: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "nem"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "igen"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Háromdimenziós hardveres gyorsítás: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Billentyűzetkiosztás: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Billentyűzetkiosztás: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Az egér típusa: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "A vízsz. frissítési frekvencia: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "A függ. frissítési frekvencia: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "A grafikus kártya: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "A kártya memóriája: %s KB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Színmélység: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Felbontás: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg meghajtó: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg beállítások"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Globális opciók"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Ctrl-Alt-Backspace letiltása"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "A grafikus kártya beállításai"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Áttetszőség bekapcsolása (Composite kiterjesztés)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Hardveresen gyorsított egérmutató használata"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "A megjelenítés gyorsításának bekapcsolása (szövegmegjelenítésnél problémákat "
 "okozhat)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Dupla megjelenítés bekapcsolása a külső monitoron"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Dupla megjelenítés bekapcsolása a második képernyőn"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "DVI kijelző erőltetése"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Külső monitorra kapcsoló BIOS billentyűkombináció engedélyezése"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 "EXA használata XAA helyett (növeli a Render és a Composite teljesítményét)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Indítás grafikus módban"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Rendszerindításkor automatikusan induljon el a grafikus felület (az Xorg)"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -570,922 +575,899 @@ msgstr ""
 "\n"
 "Valóban van tévékimenet a grafikus kártyán?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Milyen normát használ a televízió?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "egyéb"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Cseh (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Német"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak féle"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spanyol"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finn"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francia"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Angol (UK) billentyűzet"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norvég"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Lengyel"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Orosz"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Svéd"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "USA billentyűzet"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albán"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Örmény (régi)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Örmény (írógép)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Örmény (fonetikus)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arab"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Asztúriai"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbajdzsáni (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belga"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengáli (Inscript kiosztás)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengáli (Probhat kiosztás)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bolgár (fonetikus)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bolgár (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazil (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Boszniai"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibeti"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Fehérorosz"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Svájci (német kiosztás)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Svájci (francia kiosztás)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee szótagok"
+"Czech (QWERTZ)"
+msgstr "Cseh (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Cseh (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Német"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Német (\"dead key\" nélkül)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dán"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak féle (USA)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak féle (eszperantó)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak féle (francia)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak féle (Egyesült Királyság)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak féle (norvég)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak féle (lengyel)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak féle (svéd)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Észt"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spanyol"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finn"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Feröeri"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francia (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Francia (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Francia (Bepo, csak latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Francia (Bepo, csak latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Angol (UK) billentyűzet"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Grúz (\"orosz\" kiosztás)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Grúz (\"latin\" kiosztás)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Görög"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Görög (politon)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gudzsarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Horvát"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Magyar"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Ír"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Izraeli"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Izraeli (fonetikus)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iráni"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Izlandi"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Olasz"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japán 106 billentyűs"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgiz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Koreai"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurd (arab írásmód)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latin-Amerikai"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laoszi"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litván"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Lett"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedón"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (burmai)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongol (cirill)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Máltai (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Máltai (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigériai"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Holland"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norvég"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Lengyel (qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Lengyel (qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugál"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadai (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Román (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Román (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Román (alapvető)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Orosz"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Orosz (fonetikus)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Svéd"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Szlovén"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Szlovák (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Szlovák (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norvég)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (svéd/finn)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Szerb (cirill)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Szír"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Szír (fonetikus)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII kiosztás)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (írógép kiosztás)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thaiföldi (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thaiföldi (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thaiföldi (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (marokkói kiosztás) (+latin/arab)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonetikus) (+latin/arab)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tádzsik"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Türkmén"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Török (\"F\" modell)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Török (\"Q\" modell)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrán"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu billentyűzet"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "USA billentyűzet"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "USA billentyűzet (nemzetközi)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "USA billentyűzet (nemzetközi)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (USA billentyűzet billentyűnként 3 szinttel)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Üzbég (cirill)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnámi \"számsor\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoszláv (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Jobb Alt gomb"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "A két Shift gomb egyszerre"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrl és Shift gombok egyszerre"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock gomb"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift és CapsLock gombok egyszerre"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl és Alt gombok egyszerre"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt és Shift gombok egyszerre"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\" gomb"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Bal \"Windows\" gomb"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Jobb \"Windows\" gomb"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "A két Ctrl gomb egyszerre"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "A két Alt gomb egyszerre"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Bal Shift gomb"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Jobb Shift gomb"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Bal Alt gomb"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Bal Ctrl gomb"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Jobb Ctrl gomb"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1496,12 +1478,12 @@ msgstr ""
 "a különböző billentyűzetkiosztások (például: latin illetve nem latin)\n"
 "közt lehet majd váltani."
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1512,257 +1494,227 @@ msgstr ""
 "Telepítés közben a jobb oldali Control (Ctrl) billentyűvel\n"
 "lehet váltani a különböző billentyűzetkiosztások közt."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Egér"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Szabványos"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Általános PS/2 görgős egér"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 gombos"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Általános 2 gombos egér"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Általános 3 gombos egér görgőemulációval"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Görgős"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "Soros"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Általános 3 gombos egér"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan egérgörgő emulációval"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series egérgörgő emulációval"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (soros, régi C7 típus)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (soros, régi C7 típus) egérgörgő emulációval"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse egérgörgő emulációval"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 gombos"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 gombos"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 gomb, egérgörgő emulációval"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Univerzális"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Bármilyen PS/2 vagy USB-egér"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Az evdev használata"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox egér"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware egér"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "egyik sem"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Nincs egér"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Az egér tesztelése"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Válassza ki az egér típusát."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Egérválasztás"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emulálva legyen a harmadik gomb?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Egér port"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Válassza ki, hogy melyik soros porthoz csatlakozik az egere."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Gombemuláció"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "2. gomb emulálása"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3. gomb emulálása"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Tesztelje az egeret"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Az egér aktiválásához "
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MOZGASSA AZ EGÉRGÖRGŐT!"
@@ -1820,3 +1772,51 @@ msgstr "A Mageia grafikus beállításainak futtatása"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "Azonosítás szükséges a Mageia grafikus beállításainak futtatásához"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak féle"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francia"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Lengyel"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Örmény (régi)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee szótagok"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Egér"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox egér"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware egér"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Gombemuláció"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "2. gomb emulálása"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3. gomb emulálása"
diff --git a/po/id.po b/po/id.po
index 5fb2e74..b467d26 100644
--- a/po/id.po
+++ b/po/id.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2015-02-11 07:00+0000\n"
 "Last-Translator: Kiki <kiki.syahadat@yahoo.co.id>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
@@ -70,22 +70,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB atau lebih"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Server X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Pilih sebuah server X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Konfigurasi multi-head"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -94,12 +94,12 @@ msgstr ""
 "Sistem Anda mendukung konfigurasi multiple head.\n"
 "Apa yang ingin Anda lakukan?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Pilih ukuran memori perangkat grafis Anda"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -110,7 +110,7 @@ msgstr ""
 "mendukung fitur tambahan.\n"
 "Apakah Anda ingin menggunakannya?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -119,75 +119,75 @@ msgstr ""
 "Driver proprietari tidak terinstall dengan benar, mengembalikan ke driver "
 "free software."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Konfigurasi semua head secara terpisah"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Gunakan ekstensi Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Konfigurasi hanya perangkat \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Kustomisasi"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Konfigurasi Perangkat Grafis & Monitor"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Perangkat Grafis"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Resolusi"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Tes"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opsi"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "File konfigurasi Xorg Anda rusak, akan diabaikan."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -200,32 +200,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Pilih monitor untuk head #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Pilih monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generik"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Vendor"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -247,22 +247,22 @@ msgstr ""
 "jangkauan di luar kemampuan monitor Anda: Anda bisa merusak monitor Anda.\n"
 " Jika ragu-ragu, gunakan pengaturan yang biasa."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Refresh rate horizontal"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Refresh rate vertikal"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Pilih plugin"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -288,7 +288,7 @@ msgstr ""
 "grafis pada \"Atur server grafis\" di Pusat Kendali Mageia dan pilih ulang "
 "perangkat grafis Anda."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -309,85 +309,85 @@ msgstr ""
 "repositori 'nonfree' pada \"Install dan hapus software\" dan install paket "
 "firmware secara manual atau konfigurasi ulang perangkat grafis Anda."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 warna (8 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 ribu warna (15 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 ribu warna (16 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 juta warna (24 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Otomatis"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Resolusi"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Lainnya"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Pilih resolusi dan kedalaman warna"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Perangkat grafis: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Tes konfigurasi"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Apakah Anda ingin menguji konfigurasi?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Peringatan: pengujian perangkat grafis ini mungkin membuat komputer Anda "
 "membeku"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -398,160 +398,165 @@ msgstr ""
 "%s\n"
 "Cobalah ubah beberapa parameter"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Keluar dalam %d detik"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Apakah ini pengaturan yang benar?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Matikan Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "tidak ada"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "ya"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Akselerasi hardware 3D: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Layout keyboard: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Layout keyboard: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipe mouse: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "HorizSync Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "VertRefresh Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Perangkat grafis: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memori grafis: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Kedalaman warna: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolusi: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Driver Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Konfigurasi Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Opsi global"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Matikan Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opsi perangkat grafis"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Hidupkan Translucency (ekstensi Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Gunakan akselerasi hardware pointer mouse"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Hidupkan Akselerasi RENDER (ini mungkin menyebabkan bug dalam menampilkan "
 "teks)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Hidupkan tampilan duplikasi pada monitor eksternal"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Hidupkan tampilan duplikasi pada layar kedua"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Paksa mode tampilan DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Hidupkan tombol BIOS untuk pergantian monitor eksternal"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 "Gunakan EXA daripada XAA (performa lebih baik untuk Render dan Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Antarmuka grafis saat startup"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Jalankan antarmuka grafis (Xorg) secara otomatis saat booting"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -572,778 +577,745 @@ msgstr ""
 "\n"
 "Apakah Anda memiliki fitur ini?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Norm apa yang digunakan TV Anda?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "lainnya"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Ceko (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Jerman"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spanyol"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finlandia"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Perancis"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Keyboard UK"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norwegia"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polandia"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Rusia"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Swedia"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Keyboard US"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albania"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenia (lama)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenia (mesin tik)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenia (fonetik)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arab"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Asturia"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaijan (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgia"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (Inscript-layout)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgaria (fonetik)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgaria (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazil (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnia"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibet"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarusia"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Swis (layout Jerman)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Swis (layout Perancis)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee silabis"
+"Czech (QWERTZ)"
+msgstr "Ceko (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Ceko (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Jerman"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Jerman (tanpa tombol mati)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Denmark"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Perancis)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norwegia)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polandia)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Swedia)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonia"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spanyol"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finlandia"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faroe"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Perancis"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Perancis"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Yunani (politonik)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Yunani (politonik)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Keyboard UK"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgia (layout \"Rusia\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgia (layout \"Latin\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Yunani"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Yunani (politonik)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gurajati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroasia"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hungaria"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irlandia"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israel"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israel (fonetik)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iran"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandia"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italia"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Jepang 106 tombol"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kanada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgizstan"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korea"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdi (skrip arab)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Amerika Latin"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laos"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Lithuania"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latvia"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonia"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burma)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolia (cyrillic)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Malta (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Malta (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeria"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Belanda"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norwegia"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polandia (layout qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polandia (layout qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugal"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanada (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romania (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romania (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Romania (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Rusia"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Rusia (fonetik)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Swedia"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovenia"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakia (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakia (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norwegia)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (swedia/finlandia)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbia (cyrillic)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syria"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syria (fonetik)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (layout ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (layout mesin tik)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (layout maroko) (+latin/arab)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonetik) (+latin/arab)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajik"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmenistan"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1352,7 +1324,7 @@ msgstr ""
 "_: keyboard\n"
 "Turki (model \"F\")"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1361,137 +1333,147 @@ msgstr ""
 "_: keyboard\n"
 "Turki (model \"Q\")"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukraina"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Keyboard Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Keyboard US"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Keyboard US (internasional)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Keyboard US (internasional)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (keyboard US dengan 3 level per tombol)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbekistan (cyrillic)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnam \"baris nomor\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Yugoslavia (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Tombol Alt kanan"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Kedua tombol Shift bersamaan"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Tombol Control dan Shift bersamaan"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Tombol CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Tombol Shift dan CapsLock bersamaan"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Tombol Ctrl dan Alt bersamaan"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Tombol Alt dan Shift bersamaan"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Tombol \"Menu\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Tombol \"Windows\" kiri"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Tombol \"Windows\" kanan"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Kedua tombol Control bersamaan"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Kedua tombol Alt bersamaan"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Tombol Shift kiri"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Tombol Shift kanan"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Tombol Alt kiri"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Tombol Control kiri"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Tombol Control kanan"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1502,12 +1484,12 @@ msgstr ""
 "memungkinkan peralihan di antara layout keyboard yang berbeda\n"
 "(misal: latin dan non latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Peringatan"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1518,257 +1500,227 @@ msgstr ""
 "Selama instalasi, Anda harus menggunakan tombol Control Kanan\n"
 "untuk beralih di antara layout keyboard yang berbeda."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Mouse Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standar"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Mouse Roda PS2 Generik"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Mouse Kensington Thinking"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 tombol"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Mouse Generik 2 Tombol"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Mouse Generik 3 Tombol dengan emulasi Roda"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Roda"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serial"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Mouse Generik 3 Tombol"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan dengan emulasi Roda"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Sistem Mouse"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series dengan emulasi Roda"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "Seri MM"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Mouse Logitech (serial, tipe C7 lama)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Mouse Logitech (serial, tipe C7 lama) dengan emulasi Roda"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Mouse Kensington Thinking dengan emulasi Roda"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 tombol"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 tombol"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 tombol dengan emulasi Roda"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Sembarang mouse PS/2 & USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Paksa evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Pengendali S Xbox Microsoft"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Mouse VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Mouse VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "tidak ada"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Tidak ada mouse"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Pengujian mouse"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Silakan pilih tipe mouse Anda"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Pilihan mouse"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emulasikan tombol ketiga?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Port Mouse"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Silakan pilih pada serial port mana mouse Anda terhubung."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulasi tombol"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulasi Tombol 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulasi Tombol 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Silakan tes mouse"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Untuk mengaktifkan mouse,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "GERAKKAN RODA ANDA!"
@@ -1826,3 +1778,51 @@ msgstr "Jalankan Konfigurasi Grafis Mageia"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "Otentikasi diperlukan untuk menjalankan Konfigurasi Grafis Mageia"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Perancis"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polandia"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenia (lama)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee silabis"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Mouse Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Mouse VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Mouse VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulasi tombol"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulasi Tombol 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulasi Tombol 3"
diff --git a/po/is.po b/po/is.po
index 0187eb1..bd34720 100644
--- a/po/is.po
+++ b/po/is.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2009-04-08 21:32+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -65,22 +65,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB eða meira"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X miðlari"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Veldu X miðlara"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Fjölskjáa-uppsetning"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -89,12 +89,12 @@ msgstr ""
 "Kerfið styður við marga skjái samtímis.\n"
 "Hvað viltu gera?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Veldu minnisstærð skjákortsins"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -105,7 +105,7 @@ msgstr ""
 "sem gæti stutt við auka viðbætur.\n"
 "Vilt þú nota hann?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -113,75 +113,75 @@ msgid ""
 msgstr ""
 "Ekki tókst að setja inn sérsniðinn rekil, sný til baka að opnum rekli. "
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Stilla öll úttök sjálfstætt"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Nota Xinerama viðbætur"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Stilla aðeins kort \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Sérsniðið"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Stillingar skjákorts og skjás"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Hætta"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Skjákort"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Skjár"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Upplausn"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Prófa"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Valkostir"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Íforrit"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Xorg uppsetningarskráin þín er röng, hún verður hunsuð."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -194,32 +194,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Veldu skjá fyrir úttak #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Veldu skjá"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Almennur"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Framleiðandi"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -243,22 +243,22 @@ msgstr ""
 "það er MJÖG MIKILVÆGT að velja ekki of hátt tíðnisvið fyrir skjáinn.\n"
 "Hafir þú einhverjar efasemdir, veldu þá lægri stillingar."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Lárétt tíðni"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Lóðrétt tíðni"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Veldu íforrit"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -273,7 +273,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -286,83 +286,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 litir (8 bita)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 þúsund litir (15 bitar)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 þúsund litir (16 bitar)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miljón litir (24 bitar)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Sjálfvirk"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Upplausnir"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Annað"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Veldu upplausn og fjölda lita"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Skjákort: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Í lagi"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Hjálp"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Prófun á stillingum"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Viltu prófa stillingarnar?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Aðvörun: Prófun á þessu skjákorti gæti fryst tölvuna þína"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -373,157 +373,162 @@ msgstr ""
 "%s\n"
 "Reyndu að breyta einhverjum stillingum"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Hætti eftir %d sekúndur"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Er þetta rétt stilling?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "engin"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Þrívíddarhraðall: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tegund lyklaborðs: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tegund lyklaborðs: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tegund músar: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Skjár: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Lárétt tíðni skjás: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Lóðrétt tíðni skjás: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Skjákort: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Minni skjákorts: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Litadýpt: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Upplausn: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg rekill: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg uppsetning"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Valkostir skjákorts"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Virkja gagnsæi (Composite viðbætur)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Nota grafískan hraðal fyrir músarbendil"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Virkja RENDER hraðal (þetta getur valdið villum við textaskrift)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Virkja afrit af aðalskjá á tengdan skjá"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Virkja afrit af aðalskjá á aukaskjátengi"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Þvinga DVI ham á skjá"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Leyfa BIOS að sjá um að skipta um skjá"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Nota EXA í stað XAA (meiri afköst við teiknun og Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Myndrænt viðmót í ræsingu"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Ræsa grafískt viðmót (Xorg) þegar tölvan er ræst"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -544,922 +549,899 @@ msgstr ""
 "\n"
 "Viltu nota þennan möguleika?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Hvaða staðal notar sjónvarpið þitt?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "annað"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tékkneskt (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Þýskt"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spænskt"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finnskt"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Franskt"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Breskt lyklaborð"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norskt"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Pólskt"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Rússneskt"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Sænskt"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Bandarískt lyklaborð"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanskt"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenskt (gamalt)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenskt (ritvélaborð)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenskt (hljóðfræðilegt)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabískt"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Eistlenskt"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Adzerbadjanskt (latneskt)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgískt"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalskt (Inscript uppsetn.)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalskt (Probhat uppsetn.)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Búlgarskt (hljóðfræðilegt)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Búlgarskt (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasilískt (ABNT 2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnískt"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tíbetskt"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Hvít-Rússneskt"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Svissneskt (þýsk uppsetn.)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Svissneskt (frönsk uppsetn.)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Tékkneskt (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tékkneskt (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Þýskt"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Þýskt (engir dauðir lyklar)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danskt"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperantó)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Franskt)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norskt)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Pólskt)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Sænskt)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Eistlenskt"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spænskt"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finnskt"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Færeyskt"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Franskt"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Franskt"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Grískt (hljóðfr.)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Grískt (hljóðfr.)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Breskt lyklaborð"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgískt (\"Rússneskt\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgískt (\"Latínu\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grískt"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grískt (hljóðfr.)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Króatískt"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungverskt"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Írskt"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Ísraelskt"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Ísraelskt (hljóðfr.)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Íranskt"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Íslenskt"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Ítalskt"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japanskt 106 lykla"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kírgískt"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Kóreskt lyklaborð"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kúrdískt (arabískt letur)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Suður amerískt"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laóteskt"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litháskt"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Lettneska"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maóri"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedónískt"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Búrmenskt)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongólskt (kýrilískt)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltneskt (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltneskt (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nígerískt"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Hollenskt"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norskt"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Pólskt (qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Pólskt (qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portúgalskt"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadískt (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rúmenskt (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rúmenskt (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rúmenskt (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Rússneskt"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Rússneskt (hljóðfræðilegt)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Sænskt"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slóvenskt"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slóvakískt (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slóvakískt (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Norskt)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Samískt (sænsk/finnskt)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbneskt (kýrilískt)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Sýrlenskt"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Sýrlenskt (hljóðfræðilegt)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamílskt (ISCII uppsetning)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamílskt (ritvélaruppsetning)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tælenskt (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tælenskt (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tælenskt (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (marokkó uppsetn.) (+latneskt/arabískt)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (hljóðfræðileg uppsetn.) (+latneskt/arabískt)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajik lyklaborð"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Túrkmenískt"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Tyrkneskt (nútíma \"Q\" módel)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Tyrkneskt (nútíma \"Q\" módel)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Úkraínskt"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu lyklaborð"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Bandarískt lyklaborð"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Bandarískt (alþjóðlegt)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Bandarískt (alþjóðlegt)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (US lyklaborð með 3 þrep/hvern lykil)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Úsbeskt (kýrilískt)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Víetnamskt \"töluröð\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Júgóslavneskt (Latínu upps.)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Hægri Alt lykill"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Báðir Shift lyklar samtímis"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrl og Shift lyklar samtímis"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock lykill"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift og CapsLock lyklar samtímis"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl og Alt lyklar samtímis"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt og Shift lyklar samtímis"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\" lykill"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Vinstri \"Windows\" lykill"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Hægri \"Windows\" lykill"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Báðir Ctrl lyklar samtímis"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Báðir Alt lyklar samtímis"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Vinstri Shift lykill"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Hægri Shift lykill"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Vinstri Alt lykill"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Vinstri Ctrl lykill"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Hægri Ctrl lykill"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1469,12 +1451,12 @@ msgstr ""
 "Hér getur þú valið lykla eða lyklasamsetningar sem skipta \n"
 "milli mismunandi lykilboðs-uppsetninga (t.d íslenskt/enskt)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Aðvörun"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1485,257 +1467,227 @@ msgstr ""
 "Á meðan uppsetningu stendur, verður þú að nota Hægri Ctrl\n"
 "lykilinn til að víxla milli mismunandi lyklaborðs-uppsetninga."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - mús"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Venjuleg"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Almenn PS2 hjól-mús"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 hnappur"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Almenn 2 hnappa mús"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Almenn þriggja hnappa mús með skrunhermi"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Hjól"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "raðtengd"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Almenn þriggja hnappa mús"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan með skrunhermi"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series með skrunhermi"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech mús (raðtengd, gömul C7 tegund)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech mús (raðtengd, gömul C7 tegund) með skrunhermi"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse með skrunhermi"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmús"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 hnappar"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 hnappar"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 hnappar með skrunhermi"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Einhverjar PS/2 & USB mýs"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Þvinga edev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Stjórnborð S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Mús sýndarkerfis"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VVMware mús"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "engin"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Engin mús"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Prófa músina"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Veldu músartegund."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Músarval"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Herma eftir þriðja hnapp?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Músartengi"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Veldu við hvaða raðtengi músin þín er tengd."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Hnappahermir"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Tveggja hnappa hermir"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Herma eftir miðhnappi"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Vinsamlega prófaðu músina"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Til að virkja músina,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "Hreyfðu hjólið!"
@@ -1799,6 +1751,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Franskt"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Pólskt"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenskt (gamalt)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - mús"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Mús sýndarkerfis"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VVMware mús"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Hnappahermir"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Tveggja hnappa hermir"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Herma eftir miðhnappi"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Tyrkneskt (hefðbundið \"F\" módel)"
 
diff --git a/po/it.po b/po/it.po
index b4d49d1..9fcb52f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2015-03-21 12:50+0000\n"
 "Last-Translator: Guybrush88 <erpizzo@alice.it>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/mageia/language/"
@@ -64,22 +64,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB o più"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Server X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Scegli un server X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configurazione multi-monitor"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -88,12 +88,12 @@ msgstr ""
 "Il tuo sistema permette la configurazione di più monitor.\n"
 "Cosa vuoi fare?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Indica la quantità di memoria della scheda grafica"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -104,7 +104,7 @@ msgstr ""
 "ulteriori caratteristiche.\n"
 "Vuoi utilizzarlo?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -113,75 +113,75 @@ msgstr ""
 "Il driver proprietario non ha potuto essere installato correttamente, in "
 "mancanza verrà usato il driver libero."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configurare tutti gli schermi indipendentemente"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Usa l'estensione Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configura solo la scheda \"%s\" %s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personalizzato"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Configurazione della scheda video e del monitor"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Esci"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Scheda grafica"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Risoluzione"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Prova"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opzioni"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Il file di configurazione Xorg è danneggiato, verrà ignorato."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -194,32 +194,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Scegli un monitor per l'head n. %d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Scegli un monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generico"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Marca"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -243,22 +243,22 @@ msgstr ""
 "danneggiare.\n"
 "Se hai dubbi, scegli le impostazioni più caute."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Frequenza di refresh orizzontale"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Frequenza di refresh verticale"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Scegli i plugin"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -283,7 +283,7 @@ msgstr ""
 "driver grafico da \"Configura il sistema grafico\" del Centro di Controllo "
 "Mageia da cui selezionerai nuovamente la tua scheda video. "
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -304,83 +304,83 @@ msgstr ""
 "abilita il deposito 'nonfree' da \"Installa e rimuovi software\" e installa "
 "il pacchetto del firmware manualmente o riconfigura la tua scheda video."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 colori (8 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mila colori (15 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mila colori (16 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milioni di colori (24 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "IP automatico"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Risoluzioni"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Altro"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Scegli risoluzione e profondità di colore"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Scheda grafica: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Guida"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Prova della configurazione"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Vuoi provare la configurazione?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Attenzione: il test di questa scheda video può bloccare il computer"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -391,159 +391,164 @@ msgstr ""
 "%s\n"
 "Prova a cambiare dei parametri"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Uscita tra %d secondi"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "L'impostazione è corretta?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Ctrl-Alt-Backspace disabilitato: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "no"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "sì"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Accelerazione hardware 3D: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tipo di tastiera: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tipo di tastiera: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipo di mouse: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Frequenza orizzontale del monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Frequenza verticale del monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Scheda video: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memoria scheda grafica: %s KB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Profondità di colore: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Risoluzione: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Driver Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Configurazione di Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Opzioni globali"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Disabilita Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opzioni scheda grafica"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Abilita Translucency (estensione Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Usare l'accelerazione hardware per il puntatore del mouse"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Abilitata l'accelerazione RENDER (può causare problemi nella presentazione "
 "del testo)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Abilita doppia visualizzazione sul monitor esterno"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Abilita doppia visualizzazione sul secondo display"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Forza la modalità DVI per lo schermo"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Abilita un hotkey BIOS per commutare su monitor esterno"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Usare EXA invece di XAA (migliori prestazioni di Render e Composito)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Avvio con interfaccia grafica"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Avviare l'interfaccia grafica (Xorg) al boot"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -564,922 +569,899 @@ msgstr ""
 "\n"
 "È presente questa opzione?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Che normativa viene utilizzata per la TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "altro"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Ceca (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Tedesca"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spagnola"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finlandese"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francese"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Tastiera UK"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norvegese"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polacca"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Russa"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Svedese"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Tastiera US"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanese"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armena (vecchia)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armena (macchina da scrivere)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armena (fonetica)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Araba"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Asturiano"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azera (latina)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belga"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalese (mappa Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalese (mappa Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgara (fonetica)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgara (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasiliana (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosniaca"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetana"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Bielorussa"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Svizzera (mappa tedesca)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Svizzera (mappa francese)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee sillabica"
+"Czech (QWERTZ)"
+msgstr "Ceca (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Ceca (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Tedesca"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Tedesca (senza tasti morti)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danese"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Francese)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norvegese)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polacco)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Svedese)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estone"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spagnola"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finlandese"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Feringia"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francese"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Francese"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Greca (politonica)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Greca (politonica)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Tastiera UK"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgiana (mappa \"Russa\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgiana (mappa \"Latina\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Greca"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Greca (politonica)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croata"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungherese"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irlandese"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israeliana"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israeliana (fonetica)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iraniana"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandese"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italiana"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Giapponese 106 tasti"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirghisa"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Coreana"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Curda (grafia araba)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latino americana"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotiana"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Lituana"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Lettone"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedone"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongola (cirillica)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltese (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltese (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeriana"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Olandese"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norvegese"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polacca (mappa qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polacca (mappa qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portoghese"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canadese (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romena (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romena (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Romena (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Russa"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Russa (fonetica)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Svedese"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovena"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovacca (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovacca (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norvegese)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (svedese/finlandese)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serba (cirillica)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Siriana"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Siriana (fonetica)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (mappa ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (mappa macchina da scrivere)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (tastiera marocchina) (+latina/araba)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonetica) (+latina/araba)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tagica"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turcomanna"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turca (modello \"F\")"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turca (modello \"Q\")"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ucraina"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Tastiera Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Tastiera US"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Tastiera US (internazionale)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Tastiera US (internazionale)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (tastiera USA con 3 livelli per tasto)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbeka (cirillico)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita \"riga numerica\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslava (latina)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Tasto Alt di destra"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "I due tasti Shift contemporaneamente"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "I tasti Ctrl e Shift contemporaneamente"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Il tasto CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Tasti Shift e BloccaMaiusc. contemporaneamente"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Tasti Ctrl e Alt contemporaneamente"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "I tasti Alt e Shift contemporaneamente"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Tasto \"Menu\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Tasto \"Windows\" di sinistra"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Tasto \"Windows\" di destra"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "I due tasti Control contemporaneamente"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "I due tasti Alt contemporaneamente"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Tasto Shift di sinistra"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Tasto Shift di destra"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Tasto Alt di sinistra"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Tasto Control di sinistra"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Tasto Control di destra"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1490,12 +1472,12 @@ msgstr ""
 "permetterà di passare da una configurazione della tastiera\n"
 "ad un'altra (ad es. da latin a non-latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Attenzione"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1506,257 +1488,227 @@ msgstr ""
 "Durante l'installazione dovrai usare il tasto Control di destra per passare "
 "da una mappatura della tastiera all'altra."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Mouse - Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Normale"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Mouse PS2 generico con rotellina"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 pulsante"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Mouse generico a 2 Pulsanti"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Mouse generico a 3 pulsanti con emulazione rotellina"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rotellina"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seriale"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Mouse generico a 3 pulsanti"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan con emulazione rotellina"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech serie CC"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech serie CC con emulazione rotellina"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "Serie MM"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Mouse Logitech (seriale, vecchio tipo C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Mouse Logitech (seriale, vecchio tipo C7) con emulazione rotellina"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse con emulazione rotellina"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 pulsanti"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 pulsanti"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 pulsanti con emulazione rotellina"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universale"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Qualsiasi mouse PS/2 o USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Forza evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Controller Microsoft Xbox S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Mouse VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Mouse VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "nessuno"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Nessun mouse"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Prova del mouse"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Scegliere il tipo di mouse."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Scelta del mouse"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emulare il terzo tasto?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Porta del mouse"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Per favore indica la porta seriale a cui è connesso il mouse."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulazione dei pulsanti"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulazione 2 pulsanti"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulazione 3 pulsanti"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Puoi provare il mouse"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Per attivare il mouse,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MUOVI LA ROTELLINA!"
@@ -1814,3 +1766,51 @@ msgstr "Configura il sistema grafico"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "È richiesta l'autenticazione per configurare il sistema grafico"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francese"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polacca"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armena (vecchia)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee sillabica"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Mouse - Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Mouse VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Mouse VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulazione dei pulsanti"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulazione 2 pulsanti"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulazione 3 pulsanti"
diff --git a/po/ja.po b/po/ja.po
index 59190ce..c3b2a17 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2018-01-21 04:36+0000\n"
 "Last-Translator: Masanori Kakura <kakurasan@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -69,22 +69,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB 以上"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X サーバ"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "X サーバを選択してください"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "マルチ ヘッド設定"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -93,12 +93,12 @@ msgstr ""
 "お使いのシステムはマルチ ヘッド設定をサポートしています。\n"
 "どうしますか?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "グラフィックス カードのメモリ サイズを選んでください"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -109,7 +109,7 @@ msgstr ""
 "があります。\n"
 "それを使いますか?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -118,75 +118,75 @@ msgstr ""
 "プロプライエタリ ドライバが正しくインストールされていません。代わりにフリーの"
 "ドライバを使います。"
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "ヘッドを別々に設定"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama 拡張を使う"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "以下のカードだけを設定: %s %s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "カスタム"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "グラフィック カードとモニタの設定"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "終了"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "グラフィック カード"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "モニタ"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "解像度"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "テスト"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "オプション"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Xorg の設定ファイルが壊れていますが、これは無視します。"
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -199,32 +199,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "ヘッド #%d のモニタを選んでください"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "モニタを選んでください"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "プラグ アンド プレイ"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "一般"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "ベンダ"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -246,22 +246,22 @@ msgstr ""
 "モニタが破損する場合があります。\n"
 "わからない場合は低めに設定してください。"
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "水平走査周波数"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "垂直走査周波数"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "プラグインを選択"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -287,7 +287,7 @@ msgstr ""
 "ンを有効化し、\"グラフィカル サーバを設定\" に移動してグラフィックス ドライバ"
 "の再設定を行い、グラフィックス カードを再選択します。"
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -309,84 +309,84 @@ msgstr ""
 "ア パッケージを手動でインストールするか、グラフィックス カードを再設定してく"
 "ださい。"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256色 (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "3万2千色 (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "6万5千色 (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "1600万色 (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "自動"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "解像度"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "その他"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "解像度と色深度を選んでください"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "グラフィックス カード: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "ヘルプ"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "設定のテスト"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "この設定をテストしますか?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "警告: このグラフィック カードをテストするとマシンがフリーズするかもしれません"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -397,159 +397,164 @@ msgstr ""
 "%s\n"
 "設定を変更してみてください"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d 秒後に元の画面に戻ります"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "この設定でよろしいですか?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Ctrl-Alt-Backspace を無効にする: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "いいえ"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "はい"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D ハードウェア アクセラレーション: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "キーボードの配列: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "キーボードの配列: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "マウスの種類: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "モニタ: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "モニタの水平走査周波数: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "モニタの垂直走査周波数: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "グラフィックス カード: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "グラフィックス メモリ: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "色深度: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "解像度: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg ドライバ: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg の設定"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "全体設定"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Ctrl-Alt-Backspace を無効にする"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "グラフィック カードの設定"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "半透明化を有効にする (コンポジット拡張)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "マウス ポインタにハードウェア アクセラレーションを使用"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "RENDER アクセラレーションを有効にする (文字の表示に問題が生じる可能性がありま"
 "す)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "外部モニタを使っての二重表示を有効にする"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "セカンド ディスプレイを使っての二重表示を有効にする"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "強制 DVI ディスプレイ モード"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "BIOS ホットキーによる外部モニタの切り替えを有効にする"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "XAA の代わりに EXA を使う (Render と Composite のパフォーマンスを向上)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "起動時のグラフィカル インターフェース"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "起動時に自動的にグラフィカル インターフェース (Xorg) を立ち上げる"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -570,134 +575,47 @@ msgstr ""
 "\n"
 "グラフィック カードにこの機能はありますか?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "テレビの画像方式は何ですか?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "その他"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "チェコ語 (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "ドイツ語"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "スペイン語"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "フィンランド語"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "フランス語"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "イギリス式キーボード"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "ノルウェー語"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "ポーランド語"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "ロシア語"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "スウェーデン語"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "アメリカ式キーボード"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "アルバニア語"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "アルメニア語 (旧)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "アルメニア語 (タイプライター)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "アルメニア語 (phonetic)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "アラビア語"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -706,357 +624,397 @@ msgstr ""
 "_: キーボード\n"
 "アストゥリアス"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "アゼルバイジャン (ラテン)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "ベルギー"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "ベンガル語 (Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "ベンガル語 (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "ブルガリア語 (phonetic)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "ブルガリア語 (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "ブラジル (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "ボスニア語"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "ゾンカ語/チベット語"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "ベラルーシ語"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "スイス (ドイツ語配列)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "スイス (フランス語配列)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "チェロキー語 (syllabics)"
+"Czech (QWERTZ)"
+msgstr "チェコ語 (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "チェコ語 (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "ドイツ語"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "ドイツ語 (デッドキーなし)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "デヴァナガーリー"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "デンマーク語"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US 英語)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (エスペラント語)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (フランス語)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK 英語)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (ノルウェー語)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (ポーランド語)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (スウェーデン語)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "エストニア語"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "スペイン語"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "フィンランド語"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "フェーロー語"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "フランス語 (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "フランス語 (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "フランス語 (Bepo, latin-9 のみ)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "フランス語 (Bepo, latin-9 のみ)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "イギリス式キーボード"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "グルジア語 (ロシア語配列)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "グルジア語 (ラテン配列)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "ギリシャ語"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "ギリシャ語 (polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "グジャラート語"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "グルムキ"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "クロアチア語"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "ハンガリー語"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "アイルランド語"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "イヌイット語"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "イスラエル"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "イスラエル (phonetic)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "イラン語"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "アイスランド語"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "イタリア語"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "日本語 106 キーボード"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "カンナダ語"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "キルギス語"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "韓国式キーボード"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "クルド語 (アラビア表記)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "ラテンアメリカ"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "ラオス語"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1065,287 +1023,301 @@ msgstr ""
 "_: キーボード\n"
 "リトアニア"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "ラトビア語"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "マラヤーラム語"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "マオリ語"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "マケドニア語"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "ミャンマー (ビルマ)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "モンゴル語 (キリル文字)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "マルタ語 (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "マルタ語 (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "ナイジェリア"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "オランダ語"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "ノルウェー語"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "オリヤー語"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "ポーランド語 (QWERTY)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "ポーランド語 (QWERTZ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "パシュトウ語"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "ポルトガル語"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "カナダ (ケベック)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "ルーマニア語 (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "ルーマニア語 (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "ルーマニア語 (basic)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "ロシア語"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "ロシア語 (phonetic)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "スウェーデン語"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "スロベニア語"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "シンハラ語"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "スロバキア語 (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "スロバキア語 (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "サーミ語 (ノルウェー)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "サーミ語 (スウェーデン/フィンランド)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "シンド語"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "セルビア語 (キリル文字)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "シリア語"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "シリア語 (phonetic)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "テルグ語"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "タミル語 (ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "タミル語 (タイプライター)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "タイ語 (Kedmanee 配列)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "タイ語 (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "タイ語 (Pattachote 配列)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "ティフナグ (モロッコ配列) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "ティフナグ (phonetic) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "タジク語"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "トルクメン語"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1354,7 +1326,7 @@ msgstr ""
 "_: キーボード\n"
 "トルコ (F モデル)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1363,137 +1335,147 @@ msgstr ""
 "_: キーボード\n"
 "トルコ (Q モデル)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "ウクライナ語"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "ウルドゥー語"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "アメリカ式キーボード"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US キーボード (国際式)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US キーボード (国際式)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (US キーボード, キーごとに 3 レベル)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "ウズベク語 (キリル文字)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "ベトナム語 (数字列 QWERTY)"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "ユーゴスラビア (ラテン)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "右側の Alt キー"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "左右の Shift を同時に押す"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrl と Shift を同時に押す"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock キー"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift と CapsLock を同時に押す"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl と Alt を同時に押す"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt と Shift を同時に押す"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"メニュー\" キー"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "左側の \"Windows\" キー"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "右側の \"Windows\" キー"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "左右の Ctrl を同時に押す"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "左右の Alt を同時に押す"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "左側の Shift キー"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "右側の Shift キー"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "左側の Alt キー"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "左側の Ctrl キー"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "右側の Ctrl キー"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1503,12 +1485,12 @@ msgstr ""
 "キーボードの配列 (例:ラテンと非ラテン) を切り替えるキーの\n"
 "組み合わせを選んでください"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1519,257 +1501,227 @@ msgstr ""
 "インストール中は右 Ctrl キーでキーボードの配列を\n"
 "切り替えてください。"
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Mouse"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "標準"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "一般的な PS/2 ホイールマウス"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 ボタン"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "一般的な 2 ボタン マウス"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "一般的な 3 ボタン マウス (ホイール エミュレーション付き)"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "ホイール"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "シリアル"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "一般的な 3 ボタン マウス"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan (ホイール エミュレーション付き)"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series (ホイール エミュレーション付き)"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (serial, old C7 type)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (serial, old C7 type) (ホイール エミュレーション付き)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse (ホイール エミュレーション付き)"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "バスマウス"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 ボタン"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 ボタン"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "ホイール エミュレーション付きの 3 ボタン"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "ユニバーサル"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "PS/2 & USB マウス"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "evdev の使用を強制"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox コントローラ S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox マウス"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware マウス"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "なし"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "マウスなし"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "マウスのテスト"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "マウスの種類を選んでください。"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "マウスの選択"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "中ボタンをエミュレートしますか?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "マウスのポート"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "マウスが接続されているシリアル ポートを選んでください。"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "ボタンのエミュレーション"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "ボタン 2 エミュレーション"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "ボタン 3 エミュレーション"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "マウスをテストしてください。"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "マウスを有効にするには、"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ホイールを動かしてください!"
@@ -1827,3 +1779,51 @@ msgstr "Mageia グラフィック設定の実行"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "Mageia グラフィック設定の実行には認証が必要です"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "フランス語"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "ポーランド語"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "アルメニア語 (旧)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "チェロキー語 (syllabics)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "シンド語"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Mouse"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox マウス"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware マウス"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "ボタンのエミュレーション"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "ボタン 2 エミュレーション"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "ボタン 3 エミュレーション"
diff --git a/po/ko.po b/po/ko.po
index e3c0933..8b111b0 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2014-12-28 15:39+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/mageia/language/"
@@ -64,22 +64,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "16 MB 이상"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X 서버"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "X서버 고르기"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "다중 헤드 설정"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -88,12 +88,12 @@ msgstr ""
 "현재 사용하는 시스템은 다중 헤드 설정을 지원합니다.\n"
 "어떻게 하겠습니까?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "그래픽 카드의 메모리 용량을 선택하세요"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -104,84 +104,84 @@ msgstr ""
 "다.\n"
 "사용합니까?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "모든 헤드를 독립적으로 설정"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama 확장 사용"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "「%s」%s 카드만 설정"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "사용자 정의"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "그래픽 카드와 모니터 설정"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "종료"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "그래픽 카드"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "모니터"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "해상도"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "테스트"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "선택사항"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "플러그인"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 "Xorg 설정파일이 손상되었으므로, \n"
 "이 부분은 무시합니다."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -194,32 +194,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "설정할 모니터를 선택하시오. #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "모니터 선택"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "플러그앤플레이"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "일반 마우스"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "상표"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -241,22 +241,22 @@ msgstr ""
 "이것은 모니터의 능력과는 상관없이 모니터에 피해를 줄 수 있습니다. \n"
 "이에 대해 잘 모르신다면, 모니터 세팅은 건드리지 않는 것이 좋습니다. "
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "수평 주파수"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "수직 주파수"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "플러그인을 선택하시오."
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -271,7 +271,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -284,83 +284,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 색상 (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "3만2천 색상 (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "6만5천 색상 (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "천6백만 색상  (24bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "자동"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "해상도"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "기타"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "해상도와 색상을 선택하세요"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "그래픽 카드: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "확인"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "취소"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "도움말"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "설정 테스트"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "이 설정을 시험해 보시겠습니까?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "주의: 그래픽 카드를 테스트 하는중에 컴퓨터가 멈출 수도 있습니다."
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -371,159 +371,164 @@ msgstr ""
 "%s\n"
 "파라메터 값을 수정해 주십시오."
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d 초 지남"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "이 설정이 올바릅니까?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Ctrl-Alt-Backspace: %s 비활성화하기\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "아니요"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "예"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D 하드웨어 가속 : %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "키보드 형태: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "키보드 형태: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "마우스 종류: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "모니터: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "모니터 수평주파수: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "모니터 수직주파수: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "그래픽 카드: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "비디오 메모리: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "색상 심도: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "해상도: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg 드라이버: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg 설정"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "글로벌 옵션"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Ctrl-Alt-Backspace 비활성화하기"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "그래픽 카드 옵션"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "투명도 사용(Composite extension)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "하드웨어 가속된 마우스 포인터 사용"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "렌더 가속 사용(이것은 문자 표현시 버그가 발생할 수 있습니다."
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "외부 모니터 상에 중복 화면 사용"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "두번째 화면 위에 중복화면 사용"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "강제 DVI디스플레이 모드"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "외부 모니터에 스위칭 하기 위한 BIOS hotkey 사용"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "XAA 대신 EXA사용(랜더와 합성에서 더 나은 성능을 나타냄)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "시작시 바로 X-Window 실행"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "부팅시에 자동으로 X-윈도우가 시작되도록 할수 있습니다.\n"
 "재부팅시 자동으로 X-윈도우를 시작할까요?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -543,922 +548,899 @@ msgstr ""
 "\n"
 "이 기능이 있습니까?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "TV 카드가 어떤 표준(norm)을 사용합니까?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "기타"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "체코 (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "독일"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "드보락"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "스페인"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "핀란드"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "프랑스"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "영국"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "노르웨이"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "폴란드"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "러시아"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "스웨덴"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "미국"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "알바니아"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "미국 (구버전)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "미국 (타자기)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "미국 (음성학)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabic(아라비아)"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "에스토니아"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "아제르바이잔 (라틴)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "벨기에"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "벵갈"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "벵갈"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "불가리아 (음성학)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "불가리아 (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "브라질 (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "보스니아"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "종카/티벳"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "벨라루시아"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "스위스 (독어)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "스위스 (불어)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "체로키"
+"Czech (QWERTZ)"
+msgstr "체코 (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "체코 (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "독일"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "독일 (dead 키 없음)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "데봐나가리(범어)"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "덴마크"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "드보락(US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "드보락(에스페란토)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "드보락(프랑스)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "드보락(UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "드보락(노르웨이)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "드보락(폴란드)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "드보락(스웨덴)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "에스토니아"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "스페인"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "핀란드"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "파로스"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "프랑스"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "프랑스"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "그리스(Polytonic)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "그리스(Polytonic)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "영국"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "그루지아(러시아어)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "그루지아 (라틴)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "그리스"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "그리스(Polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "구자라티(아프리카)"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "크로아티아"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "헝가리"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "아일랜드"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "이스라엘"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "이스라엘 (음성학)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "이란"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "아이슬랜드"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "이탈리아"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "일본 106키"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "카나다"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "키르기즈"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "한글 키보드"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "쿠르드(아랍)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "라틴 아메리카"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "라오스"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "라트바아"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "말라얄람(드라비다)"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "마오리"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "마케도니아"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "미얀마(버마)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "몽골(시릴)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "몰타(영국)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "몰타(미국)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "나이지리아"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "네델란드"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "노르웨이"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "오리야(인도)"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "폴란드 (QwertY)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "폴란드 (QwertZ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "파슈토(아프간)"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "포루투갈"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "캐나다 (퀘벡)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "로만 (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "로만 (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "로만 (QWERTZ)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "러시아"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "러시아 (음성학)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "스웨덴"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "슬로베니아"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "신할라(스리랑카)"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "슬로바키아 (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "슬로바키아 (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "사미(노르웨이)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "사미(스웨덴/핀란드)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "신드"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "세르비아 (시릴)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "시리아"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "시리아 (음성학)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "텔루그(인도)"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "타밀(아스키)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "타밀 (타자기)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "타이"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "타이(TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "타이(Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "티피나그 (모로코) (라틴/아라비아 더해짐)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "티피나그 (음성학) (라틴/아라비아 더해짐)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "타지크"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "투르크멘"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "우크라이나"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "우르두(파키스탄)"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "미국"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US 키보드 (국제)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US 키보드 (국제)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (US keyboard with 3 levels per key)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "우즈벡 (시릴)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "베트남 (숫자열 QWERTY)"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "유고슬라비아 (라틴)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "오른쪽 Alt 키"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "양쪽 쉬프트키를 같이"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "컨트롤키와 쉬프트키를 같이"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock key"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "쉬프트키와 캡스락키를 같이"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "컨트롤키와 알트키를 같이"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "알트키와 쉬프트키를 같이"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"메뉴\"키"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "왼쪽 \"윈도우\"키"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "오른쪽 \"윈도우\"키"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "양쪽 컨트롤키를 같이"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "양쪽 알트키를 같이"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "왼쪽 쉬프트 키"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "오른쪽 쉬프트 키"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "왼쪽 알트 키"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "왼쪽 컨트롤 키"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "오른쪽 컨트롤 키"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1468,12 +1450,12 @@ msgstr ""
 "서로 다른 키보드 방식으로 전환하는 \n"
 "키 또는 키조합을 선택하시오."
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "경고"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1484,257 +1466,227 @@ msgstr ""
 "설치 도중에 다른 키보드 방식과 전환하려면 \n"
 "오른쪽 CTRL 키를 사용하십시오."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - 마우스"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "표준"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "로지텍 마우스맨/퍼스트마우스 (시리얼)"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "일반적인 PS2 휠 마우스"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "ALPS 글라이드포인트"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "켄싱턴 씽킹 마우스"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "지니어스 넷마우스"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "지니어스 넷스크롤"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "마이크로소프트 익스플로러"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 버튼"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "일반적인 2버튼 마우스"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "휠 에물레이션이 있는 일반적인 3버튼 마우스"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "휠 마우스"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "시리얼 마우스"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "일반적인 3버튼 마우스"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "마이크로소프트 인텔리마우스"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "로지텍 마우스맨"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "휠 에뮬레이션이 있는 로지텍 마우스맨"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "마우스 시스템"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "로지텍 CC 시리즈"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "휠 에뮬레이션이 있는 로지텍 CC 시리즈"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "로지텍 마우스맨+/퍼스트마우스+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM 시리즈"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM 히트타블렛"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "로지텍 마우스 (시리얼, 오래된 C7 형태)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "휠 에뮬레이션이 있는 로지텍 마우스(시리얼, 오래된 C7형태)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "휠 에뮬레이션이 있는 켄싱턴 마우스"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "버스마우스"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 버튼"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 버튼"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3버튼 휠 에뮬레이션"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "세계 공용"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "일반적인 PS/2 나 USB 마우스"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "강제 endev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "마이크로소프트 xbox 컨트롤 S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "버추얼 박스 마우스"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VM웨어 마우스"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "없음"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "마우스 없음"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "마우스 테스트"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "마우스 종류를 선택하세요."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "마우스 선택"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "3버튼 에뮬레이트?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "마우스 포트"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "마우스에 연결된 시리얼 포트는 어떤 것입니까?"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "버튼 에뮬레이션"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "버튼 2 에뮬레이션"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "버튼 3 에뮬레이션"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "마우스를 테스트하세요."
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "마우스를 활성화하려면"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "마우스 휠을 움직이십시오."
@@ -1792,3 +1744,51 @@ msgstr "마제야 그래픽 설정 실행하기"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "마제야 그래픽 설정을 실행하기 위해서 인증이 필요합니다."
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "드보락"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "프랑스"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "폴란드"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "미국 (구버전)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "체로키"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "신드"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - 마우스"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "버추얼 박스 마우스"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VM웨어 마우스"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "버튼 에뮬레이션"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "버튼 2 에뮬레이션"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "버튼 3 에뮬레이션"
diff --git a/po/ky.po b/po/ky.po
index 0a6a478..7c49bfe 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-ky\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2009-12-25 22:50+0600\n"
 "Last-Translator: Ilyas Bakirov <just_ilyas@yahoo.com>\n"
 "Language-Team: Kyrgyz\n"
@@ -62,22 +62,22 @@ msgstr "32 Мб"
 msgid "64 MB or more"
 msgstr "64 Мб же андан көп"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X сервер"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "X серверин тандаңыз"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Көп башчалуу конфигурация"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -86,12 +86,12 @@ msgstr ""
 "Сиздин системаңыз көп башчалуу конфигурацияны колдоно алат.\n"
 "Сиз эмне кылайын дейсиз?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Сиздин графикалык картаңыздын эсинин көлөмүн тандаңыз"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -102,7 +102,7 @@ msgstr ""
 "проприетардык драйверлер табылды.\n"
 "Аларды колдонууну каалайсызбы?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -111,76 +111,76 @@ msgstr ""
 "Проприетардык драйвери орнотулган жок, алдын ала бекер драйвер колдонулуп "
 "жатат."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Бардык башчаларды көз карандысыз конфигурациялоо"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama кеңейтүүсүн колдонуу"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "\"%s\"%s картасын гана конфигурациялоо"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Тандама"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Графикалык карта жана монитор ырастоолору"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Чыгуу"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Графикалык карта"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Монитор"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Майдалыгы"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Сыноо"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Параметрлер"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Плагиндер"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 "Сиздин Xorg конфигурациялоо файлыңыз жабыркаган, биз аны эсепке албайбыз."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -193,32 +193,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "№%d баш үчүн монитор тандаңыз"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Монитор тандаңыз"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Кадимки"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Өндүрүүчү"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -241,22 +241,22 @@ msgstr ""
 "жаңылоо жыштыгын бербөө ӨТӨ МААНИЛҮҮ: сиз мониторуңузду бузуп\n"
 "алышыңыз мүмүкүн. Эгер өзүңүзгө ишенбесеңиз - коопсуз орнотууну тандаңыз."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Горизонталдык жаңылоо жыштыгы"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Вертикалдык жаңылоо жыштыгы"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Модулдарды тандаңыз"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -271,7 +271,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -284,83 +284,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 түс (8 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 миң түс (15 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 миң түс (16 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 миллион түс (24 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Автоматтык"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Майдалыгы"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Башка"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Майдалыгын жана түстүн тереңдигин тандаңыз"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Видеокарта: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "ОК"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Айнуу"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Жардам"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Конфигурацияны сынап көрүү"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Конфигурацияны сынап текшерүүнү каалайсызбы?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Эскертүү: видеокартаны сыноо учурунда машинаңыз катып калуусу мүмкүн"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -371,158 +371,163 @@ msgstr ""
 "%s\n"
 "Кээ бир параметрлерди өзгөртүп көрүңүз"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d секундадан соң жабылат"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Бул параметрлер туурабы?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Ctrl-Alt-Backspace иштен чыгаруу: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "жок"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "ооба"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D жабдыктык тездөө: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Алипкарта: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Алипкарта: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Чычкан түрү: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Монитор: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Монитордун HorizSync: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Монитордун VertRefresh: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Видеокарта: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Видеокарта эси: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Түс тереңдиги: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Майдалыгы: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg драйвери: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg конфигурациясы"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Глобалдык параметрлер"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Ctrl-Alt-Backspace иштен чыгаруу"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Видео картанын опциялары"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Тунуктукту иштетүү (Composite кеңейтилиши)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Чычкан курсору үчүн жабдыктык тездедүүнү колдонуу"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "RENDER тездетүүнү иштетүү (текст көрсөтүүдө каталарды алып келиши мүмкүн)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Экран дубликатын тышкы монитордо иштетүү"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Экран дубликатын экинчи монитордо иштетүү"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "DVI чыгыш режимин мажбур кылуу"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Тышкы мониторго өтүү үчүн BIOS ыссык клавишасын иштетүү"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "XAA ордуна EXA колдонуу (Render жана Composite үчүн жакшы ылдамдык)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Система жүктөлүүдөгү графикалык интерфейс"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Жүктөөдө графикалык интерфейсти (Xorg) автоматтык түрдө баштоо"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -543,922 +548,899 @@ msgstr ""
 "\n"
 "Сизде ушундай мүмкүнчүлүк барбы?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Сиздин телевизор кайсы форматты колдонот?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "башка"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Чехтик (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Немистик"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Дворактык"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Испандык"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Финдик"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Француздук"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK ариптергичи"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Норвегиялык"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Поляктык"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Орустук"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Шведдик"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US ариптергичи"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Албандык"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Армяндык (эски)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Армяндык (басмамашине)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Армяндык (фонетикалык)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Араптык"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Эстондук"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Азербайжандык (латын)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Бельгиялык"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Бенгалдык (Inscript-layout)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Бенгалдык (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Болгардык (фонетикалык)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Болгарская (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Бразилдик (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Босниялык"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Дзонгха/Тибеттик"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Белорустук"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Швейцардык (немисче жайгашуусу)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Швейцардык (французча жайгашуусу)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Чехтик (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Чехтик (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Немистик"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Немистик (жансыз баскычтарсыз)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Деванагари"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Даниялык"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Дворактык (АКШ)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Дворактык (Эсперанто)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Дворактык (Французча)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Дворактык (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Дворактык (норвегче)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Дворактык (Полякча)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Дворактык (Шведче)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Эстондук"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Испандык"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Финдик"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Фарердик"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Француздук"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Француздук"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Гректик (polytonic)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Гректик (polytonic)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK ариптергичи"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Грузиндик (\"орусча\" жайгашуу)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Грузиндик (\"латынча\" жайгашуу)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Гректик"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Гректик (polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Гужараттык"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Гурмукилик"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Хорваттык"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Венгердик"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Ирланддык"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Инуктитуттук"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Израилдик"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Израилдик (фонетикалык)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Ирандык"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Исланддык"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Итальяндык"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Жапондук 106 баскыч"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Кыргыздык"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Кореялык"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Күрддүк (arabic script)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Латынамерикалык"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Лаостук"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Литовдук"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Латвиялык"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Малайдык"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Маори"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Македондук"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Мьянмдык (Бирма)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Монголдук (кириллица)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Мальтиялык (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Мальтиялык (США)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Нигерийдик"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Голланддык"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Норвегиялык"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Ориссалык"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Поляктык (QWERTY жайгашуусу)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Поляктык (QWERTZ жайгашуусу)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Португалдык"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Канадалык (Квебек)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Румындык (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Румындык (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Румындык (QWERTZ)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Орустук"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Орустук (фонетикалык)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Шведдик"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Словендик"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Словактык (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Словактык (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Саамилик (норвегиялык)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Саами (шведдик/финдик)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Сербдик (кириллица)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Сириялык"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Сириялык (фонетикалык)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Тамилдик (ISCII жайгашуусу)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Тамилдик (басмамашине жайгашуусу)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (moroccan layout) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (phonetic) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Тажиктик"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Түркмөндүк"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Түрктүк (соңку \"Q\" модели)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Түрктүк (соңку \"Q\" модели)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Украиндик"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Урду ариптергичи"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US ариптергичи"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US ариптергичи (эларалык)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US ариптергичи (эларалык)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (клавишанын 3 денгээли менен US-алиптергичи)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Өзбектик (кириллица)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Вьетнамдык \"сандык катар\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Югославдык (латын)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Оңдогу Alt баскычы"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Кош Shift баскычтарын тең бирдей"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control жана Shift баскычтарын тең бирдей"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock баскычы"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift жана CapsLock баскычтарын тең бирдей"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl жана Alt баскычтарын тең бирдей"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt жана Shift баскычтарын тең бирдей"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Меню\" баскычы"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Солдогу \"Windows\" баскычы"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Оңдогу \"Windows\" баскычы"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Кош Control баскычтарын тең бирдей"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Кош Alt баскычтарын тең бирдей"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Солдогу Shift баскычы"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Оңдогу Shift баскычы"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Солдогу Alt баскычы"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Солдогу Control баскычы"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Оңдогу Control баскычы"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1469,12 +1451,12 @@ msgstr ""
 "же бир нече клавишалардын комбинацияларын тандап алуу\n"
 "мүмкүн (мисалы: англисче,орусча жана кыргызча)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Эскертүү"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1485,258 +1467,228 @@ msgstr ""
 "Орнотуу мезгилинде бир нече алиптергич жайгалыштары арасында\n"
 "өтүү үчүн «Оң Control» клавишасын колдонуңуз."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun чычканы"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Стандарттык"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Кадимки дөңгөлөктүү PS2 чычканы"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 баскыч"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Кадимки 2 баскычтуу чычкан"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Кадимки 3 баскычтуу чычкан; дөңгөлөктү эмуляциялоо менен"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Дөңгөлөк"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "удаалаш"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Кадимки 3 баскычтуу чычкан"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan; дөңгөлөктү эмуляциялоо менен"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series; дөңгөлөктү эмуляциялоо менен"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (удаалаш, эски C7 тибиндеги)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr ""
 "Logitech Mouse (удаалаш, эски C7 тибиндеги); дөңгөлөктү эмуляциялоо менен"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse; дөңгөлөктү эмуляциялоо менен"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 баскычтуу"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 баскычтуу"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 баскычтуу; дөңгөлөктү эмуляциялоо менен"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Универсалдык"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Бардык PS/2 & USB чычканы"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "evdev зордуктап баштоо"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox чычканы"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware чычканы"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "жок"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Чычкан түзүлүшү жок"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Чычканды текшерүү"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Чычкан тибин тандаңыз."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Чычкан тандоо"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Үчүнчү баскычты эмуляциялообу?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Чычкан порту"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Чычкандын туташкан портту көрсөтүңүз."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Баскычтарды эмуляциялоо"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "2 баскычты эмуляциялоо"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3 баскычты эмуляциялоо"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Өзүңүздүн чычканыңызды текшериңиз"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Чычканды ишке киргизүү үчүн,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ДӨҢГӨЛӨКТҮ КЫЙМЫЛГА КЕЛТИРИҢИЗ!"
@@ -1800,6 +1752,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Дворактык"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Француздук"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Поляктык"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Армяндык (эски)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun чычканы"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox чычканы"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware чычканы"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Баскычтарды эмуляциялоо"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "2 баскычты эмуляциялоо"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3 баскычты эмуляциялоо"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Түрктүк (адаткы \"F\" модели)"
 
diff --git a/po/lt.po b/po/lt.po
index 8f54579..58eb623 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-06-15 20:39+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -64,34 +64,34 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB ar daugiau"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X serveris"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Pasirinkite savo vaizdo plokštės atminties dydį"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -102,82 +102,82 @@ msgstr ""
 "palaikyti papildomas ypatybes.\n"
 "Ar norite ją naudoti?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Prisitaikyti"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Išeiti"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitorius"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Skiriamoji geba"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Bandyti"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Parinktys"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Priedai"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -190,32 +190,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Pasirinkite monitorių"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Paprasta"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Tiekėjas"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -237,22 +237,22 @@ msgstr ""
 "už palaikomą monitoriaus, nes gali jį sugadinti. Jeigu abejoji,\n"
 "pasirink konservatyvią nuostatą."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horizontalaus atnaujinimo dažnis"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikalaus atnaujinimo dažnis"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -267,7 +267,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -280,83 +280,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 spalvos (8 bitai)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tūkst. spalvų (15 bitų)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tūkst. spalvų (16 bitų)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milijonai spalvų (24 bitai)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatinė"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Skiriamosios gebos"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Kitas"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Pasirink skiriamąją gebą ir spalvų gylį"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Vaizdo plokštė: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Gerai"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Pagalba"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Nustatymų tikrinimas"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Ar tu nori išbandyti nustatymus?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -367,157 +367,162 @@ msgstr ""
 "%s\n"
 "Pabandykite pakeisti kai kuriuos parametrus"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Ar tai teisingas nustatymas?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "ne"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "taip"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D aparatinės įrangos spartinimas: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klaviatūros išdėstymas: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Klaviatūros išdėstymas: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Pelės tipas: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitorius: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitoriaus horiz. skleistinė: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitoriaus vert. skleistinė: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Vaizdo plokštė: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Vaizdo atmintis: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Spalvų gylis: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Skiriamoji geba: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg tvarkyklė: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg konfigūravimas"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Visuotinės parinktys"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X paleidžiant"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -530,922 +535,899 @@ msgid ""
 "Do you have this feature?"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Čekų (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Vokiečių"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorako"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Ispanų"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Suomių"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Prancūzų"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Jungtinės karalystės klaviatūra"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norvegų"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Lenkų"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Rusų"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Švedų"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "JAV klaviatūra"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armėnų (senoji)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armėnų (spausd. mašinėlės)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armėnų (fonetinė)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr ""
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr ""
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidžaniečių (lotyniška)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgų"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr ""
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgarų (fonetinė)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgarų (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazilų (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr ""
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr ""
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Baltarusių"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Šveicarų (Vokiškas išdėstymas)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Šveicarų. (Prancūziškas išdėstymas)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr ""
+"Czech (QWERTZ)"
+msgstr "Čekų (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Čekų (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Vokiečių"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Vokiečių (be mirusių klavišų)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr ""
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danų"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorako (JAV)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr ""
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr ""
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr ""
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorako (Norvegų)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estų"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Ispanų"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Suomių"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr ""
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Prancūzų"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr ""
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
-msgstr ""
+"French (Bepo latin9)"
+msgstr "Prancūzų"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Lenkų (QWERTY išdėstymas)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Jungtinės karalystės klaviatūra"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gruzinų (\"Rusiškas\" išdėstymas)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gruzinų (\"Latin\" išdėstymas)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Graikų"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr ""
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr ""
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroatų"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Vengrų"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr ""
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Izraelio"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Žydų (Fonetinė)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iraniečių"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandų"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italų"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japoniška 106 klavišų"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr ""
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr ""
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr ""
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr ""
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Lotynų Amerikos"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr ""
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr ""
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr ""
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedoniečių"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr ""
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr ""
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr ""
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Olandų"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norvegų"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr ""
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Lenkų (QWERTY išdėstymas)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Lenkų (QWERTZ išdėstymas)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr ""
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugalų"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadiečių (Kvebeko)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr ""
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr ""
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Rusų"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Rusiška (Fonetinė)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Švedų"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovėnų"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakų (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakų (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr ""
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr ""
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr ""
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr ""
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr ""
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr ""
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr ""
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr ""
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr ""
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainiečių"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr ""
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "JAV klaviatūra"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "JAV klaviatūra (tarptautinė)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "JAV klaviatūra (tarptautinė)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamiečių \"skaičių eilė\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Abu Shift klavišai vienu metu"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control ir Shift klavišai vienu metu"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock klavišas"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift ir CapsLock klavišai vienu metu"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl ir Alt klavišai vienu metu"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt ir Shift klavišai vienu metu"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Meniu\" klavišas"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Kairysis \"Windows\" klavišas"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Dešinysis \"Windows\" klavišas"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Abu Control klavišai vienu metu"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Abu Alt klavišai vienu metu"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr ""
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr ""
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1456,12 +1438,12 @@ msgstr ""
 "leis perjungti skirtingus klaviatūros išdėstymus\n"
 "(pvz.,: lotynų ir ne lotynų)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Dėmėsio"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1472,258 +1454,228 @@ msgstr ""
 "Įdiegimo metu, norėdami perjungti skirtingus klaviatūros\n"
 "išdėstymus, turėsite naudoti dešinįjį Control klavišą."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - pelė"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standartinė"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Paprasta PS2 pelė su ratuku"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr ""
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Paprasta 2 klavišų pelė"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Su ratuku"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "nuoseklioji"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Paprasta 3 klavišų pelė"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (nuoseklioji, seno C7 tipo)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 klavišų"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 klavišų"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universali"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr ""
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox pelė"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware pelė"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "jokios"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Pelės nėra"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr ""
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr ""
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Ar emuliuoti trečią klavišą?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Pelės prievadas"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr ""
 "Prašome pasirinkti, prie kurios nuosekliosios jungties prijungta jūsų pelė."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Prašome išbandyti pelę"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Kad sužadintum pelę,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "PASUK RATUKĄ!"
@@ -1781,3 +1733,27 @@ msgstr ""
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorako"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Lenkų"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armėnų (senoji)"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - pelė"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox pelė"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware pelė"
diff --git a/po/ltg.po b/po/ltg.po
index 73f13ff..c3c494a 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2004-02-24 13:01+0200\n"
 "Last-Translator: Māris Laureckis <linux@latgola.lv>\n"
 "Language-Team: Latgalian <linux@latgola.lv>\n"
@@ -59,22 +59,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB voi vairuok"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X servers"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Izavielejit X serveri"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Vairuoku ekranu konfiguraceja"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -83,12 +83,12 @@ msgstr ""
 "Jiusu sistama atbolsta vairuoku ekranu konfiguraceju.\n"
 "Kū jius gribit dareit?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Izavielejit grafiskuos kartis atminis apjūmu"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -96,82 +96,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Konfigurēt vysus ekranus naatkareigi"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Lītuot Xinerama paplašynuojumu"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Konfigurēt tikai karti \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Pīlāguota"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Savīnuojuma konfigureišona"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Beigt"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafiskuo karte"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitors"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Izškirtspieja"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Puorbaudeit"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opcejis"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -184,32 +184,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Izavielejit monitoru"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Izavielejit monitoru"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Vyspuorieja"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Izgatavuotuojs"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -233,22 +233,22 @@ msgstr ""
 "monitoru.\n"
 " Ja naesit puorlīcynuots, izavielejit drūšuokū uzstuodeišonu."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horizontaluo frekvence"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikaluo frekvence"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Izavielejit darbeibu"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -263,7 +263,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -276,84 +276,84 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 kruosys (8 biti)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tyukstūšys kruosu (15 biti)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tyukstūšys kruosu (16 biti)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miļjoni kruosu (24 biti)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatisks"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Izškirtspiejis"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Cyts"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Nūruodit izškirtspieju i kruosu dziļumu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafiskuo karte: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Labi"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Atceļt"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Paleidzeiba"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Konfiguracejis izmieginuošona"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Voi gribit izmieginuot itū konfiguraceju?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Breidynuojums: ituos grafiskuos kartis izmieginuošona var uzkuort datoru"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -361,152 +361,157 @@ msgid ""
 "Try to change some parameters"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Aizaviers piec %d sekundem"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Voi tys ir pareizs uzstuodiejums?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "nav"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klaviaturys izkuortuojums: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Klaviaturys izkuortuojums: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Pelis tips: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitors: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitora horiz. frekv.: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitora vert. frekv.: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafiskuo karte: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafiskuo atmiņa: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Kruosu dziļums: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Izškirtspieja: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg draivers: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg konfiguraceja"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Grafiskuo karte: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Grafiskuo saskarne pi starteišonys"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
@@ -514,7 +519,7 @@ msgstr ""
 "grafiskuo saskarne (Xorg).\n"
 "Voi gribit, lai piec puorstarteišonys tyktu palaists  Xorg?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, fuzzy, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -535,922 +540,899 @@ msgstr ""
 "\n"
 "Vai Jums ir šī iespēja?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Kaidu TV standartu jius izmontojat?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Čehejis (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Vuocejis"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvoraka"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spānejis"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Sūmejis"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francejis"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Apvīnuotuos Karalistis klaviatura"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norvegejis"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Pūlejis"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Krīvejis"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Zvīdrejis"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "ASV klaviatura"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albaņu"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenejis  (vacuo)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenejis (rokstommašyna)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenejis (fonetiskuo)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabu"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Igaunejis"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidžanys (latiņu)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Beļgejis"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengaļu (Inscript izvītuojums)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengaļu (Probhat izvītuojums)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgaru (fonetiskuo)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgaru (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazīlejis (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnīšu"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Bosnīšu"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Boltkrīvejis"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Šveicis (vuocu izvītuojums)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Šveicis (franču izvītuojums)"
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Arabu"
+"Czech (QWERTZ)"
+msgstr "Čehejis (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Čehejis (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Vuocejis"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Vuocejis (bez māmajim taustenim)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dānejis"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvoraka (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvoraka (Norvegejis)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvoraka (Norvegejis)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvoraka (US)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvoraka (Norvegejis)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvoraka (Zvīdru)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvoraka (Zvīdru)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Igaunejis"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spānejis"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Sūmejis"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Greku"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francejis"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Francejis"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Armenejis (fonetiskuo)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Armenejis (fonetiskuo)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Apvīnuotuos Karalistis klaviatura"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gruzejis (\"krīvu\" izvītuojums)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gruzejis (\"latiņu\" izvītuojums)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Greku"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Horvatejis"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungārejis"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Īru"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Izraelys"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Izraelys (fonetiskuo)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranys"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandis"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italejis"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japuonys 106 taisteni"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kanada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Apvīnuotuos Karalistis klaviatura"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korejīšu klaviatura"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Arabu"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latiņamerikys"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laoīšu"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Iranys"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latvīšu"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr ""
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonejis"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongoļu (kirilica)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltese (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltese (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Dānejis"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norvegejis"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Pūlejis (qwerty izvītuojums)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Pūlejis (qwertz izvītuojums)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pūlejis"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugālis"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadys (Kvebeka)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumāņu (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumāņu (qwertz)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumāņu (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Krīvejis"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Krīvejis (fonetiskuo)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Zvīdrejis"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovenejis"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakejis (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakejis (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Norvegejis)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Tai klaviatura"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbu (kirilica)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syriac"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syriac (fonetiskuo)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamilu (ISCII izkuortuojums)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamilu (rokstommašyna)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tai klaviatura"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tai klaviatura"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tai klaviatura"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadžiku klaviatura"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Vuocejis"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turcejis (modernais \"Q\" modeļs)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turcejis (modernais \"Q\" modeļs)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainys"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "ASV klaviatura"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "ASV klaviatura (starptautiskuo)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "ASV klaviatura (starptautiskuo)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbeku (kirilica)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vjetnamys \"numeru rynda\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Dīnvydslavu (latiņu)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Lobais Alt taustiņs"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Obi Shift tausteņi vīnlaiceigi"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrll i Shift tausteni vienlaicīgi"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock tausteņš"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, fuzzy, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Ctrl i Alt tausteni vīnlaiceigi"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl i Alt tausteni vīnlaiceigi"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt i Shift tausteni vīnlaiceigi"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Izvieļne\" tausteņš"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Kreisais \"Windows\" tausteņš"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Lobais \"Windows\" tausteņš"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Obi Control tausteņi vīnlaiceigi"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Obi Alt tausteņi vīnlaiceigi"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Kreisais Shift tausteņš"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Lobais Shift tausteņs"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Kreisais Alt tausteņs"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Kreisas Control tausteņs"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Lobais Control tausteņs"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1461,12 +1443,12 @@ msgstr ""
 "kas jiusim ļaus puorsaslēgt storp dažaidim klaviaturys\n"
 "izkuortojumim (pīmāram, latiņu i na-latiņu)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Uzmaneibu"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1474,257 +1456,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - pele"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standarta"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Parosta PS2 pele ar riteni"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 pūga"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Parosta 2 pūgu pele"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Parosta 3 pūgu pele"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Ritenis"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seriala"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Parosta 3 pūgu pele"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan ar riteneiša emulaceju"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series ar riteneiša emulaceju"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (seriala, vacs C7 tips)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (seriala, vacs C7 tips)  ar riteneiša emulaceju"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse  ar riteneiša emulaceju"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 pūgys"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 pūgys"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 pūgys ar riteneiša emulaceju"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universals"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Nav pelis"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "nav"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Nav pelis"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Lyudzu izavielejit jiusu pelis tipu."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "Manuali"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Voi emulēt trešū pūgu?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Pelis ports"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Lyudzu izavielejit, ar kuru serialū portu ir saslāgta pele."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Pūgu emulaceja"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "2. pūgys emulaceja"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3. pūgys emulaceja"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Lyudzu notestejit peli"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Lai aktivizeitu peli,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "PAKUSTYNOJIT PELIS RITENI!"
@@ -1788,6 +1740,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvoraka"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francejis"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Pūlejis"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenejis  (vacuo)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Arabu"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Tai klaviatura"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - pele"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Nav pelis"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Pūgu emulaceja"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "2. pūgys emulaceja"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3. pūgys emulaceja"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Turcejis (tradicionalais \"F\" modeļs)"
 
diff --git a/po/lv.po b/po/lv.po
index 2ffdc7a..0e227b5 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2002-09-27 17:45+0200\n"
 "Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
 "Language-Team: Latvian <ll10nt@listes.murds.lv>\n"
@@ -59,22 +59,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB vai vairāk"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X serveris"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, fuzzy, c-format
 msgid "Choose an X server"
 msgstr "Izvēlieties X serveri"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "N-ekrānu konfigurācija"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, fuzzy, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -83,12 +83,12 @@ msgstr ""
 "Jūsu sistēma atbalsta n-ekrānu konfigurāciju.\n"
 "Ko nu darīsim?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Izvēlieties grafiskās kartes atmiņas apjomu"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -96,82 +96,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Konfigurēt visus ekrānus neatkarīgi"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Lietot Xinerama piebūvi"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Konfigurāt tikai karti \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Pielāgota"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Savienojuma konfigurēšana"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Beigt"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafiskā karte"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitors"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Izšķirtspēja"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Pārbaude"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opcijas"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Spraudņi"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -184,32 +184,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Norādiet monitoru"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Norādiet monitoru"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Vispārēja"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Pārdevējs"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -232,22 +232,22 @@ msgstr ""
 "monitoru.\n"
 " Ja neesat pārliecināts, izvēlieties konservatīvāko variantu."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horizontālā frekvence"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikālā frekvence"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Izvēlieties darbību"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -262,7 +262,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -275,83 +275,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 krāsas (8 biti)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tūkstoši krāsu (15 biti)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tūkstoši krāsu (16 biti)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miljoni krāsu (24 biti)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automātiski"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Izšķirtspējas"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Cits"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Norādiet izšķirtspēju un krāsu dziļumu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafiskā karte: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Labi"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Palīdzība"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Konfigurācijas izmēģināšana"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Vai vēlaties izmēģināt šo konfigurāciju?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Brīdinājums: šīs grafiskās kartes izmēģināšana var uzkārt datoru"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -359,159 +359,164 @@ msgid ""
 "Try to change some parameters"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, fuzzy, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d sekundes"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, fuzzy, c-format
 msgid "Is this the correct setting?"
 msgstr "Vai tas ir pareizi?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "neviens"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastatūras izkārtojums: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tastatūras izkārtojums: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Peles tips: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitors: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitora horiz. frekv.: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitora vert. frekv.: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafiskā karte: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafiskā atmiņa: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Krāsu dziļums: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Izšķirtspēja: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg draiveris: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg konfigurācija"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Grafiskā karte: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X pēc startēšanas"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Datoru var konfigurēt, lai pēc sistēmas ielādes automātiski startētu X.\n"
 "Vai vēlaties, lai pēc pārstartēšanas tiktu palaists X?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, fuzzy, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -532,922 +537,899 @@ msgstr ""
 "\n"
 "Vai Jums ir šī iespēja?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Kādu TV standartu jūs izmantojat?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Čehijas (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Vācijas"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvoraka"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spānijas"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Somijas"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francijas"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Apvienotās Karalistes"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norvēģijas"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polijas"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Krievijas"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Zviedrijas"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "ASV tastatūra"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albāņu"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armēnijas (vecā)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armēnijas (rakstāmmašīna)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armēnijas (fonētiskā)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arābu"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Igaunijas"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidžānas (latīņu)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Beļģijas"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengāļu (Inscript izvietojums)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengāļu (Probhat izvietojums)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgāru (fonētiskā)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgāru (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazīlijas (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosniešu"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Bosniešu"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Baltkrievijas"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Šveices (vācu izvietojums)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Šveices (franču izvietojums)"
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Arābu"
+"Czech (QWERTZ)"
+msgstr "Čehijas (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Čehijas (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Vācijas"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Vācijas (bez mēmajiem taustiņiem)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dānijas"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvoraka (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvoraka (Norvēģijas)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvoraka (Norvēģijas)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvoraka (US)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvoraka (Norvēģijas)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvoraka (Zviedru)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvoraka (Zviedru)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Igaunijas"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spānijas"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Somijas"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Grieķijas"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francijas"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Francijas"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Armēnijas (fonētiskā)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Armēnijas (fonētiskā)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Apvienotās Karalistes"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gruzijas (\"krievu\" izvietojums)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gruzijas (\"latīņu\" izvietojums)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grieķijas"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Horvātijas"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungārijas"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Izraēlas"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Izraēlas (fonētiskā)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Irānas"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandes"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Itālijas"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japānas 106 taistiņi"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kanāda"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Apvienotās Karalistes"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korejiešu tastatūra"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Arābu"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latīņamerikas"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laoiešu"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Irānas"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latviešu"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr ""
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Maķedonijas"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongoļu (kirilica)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltese (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltese (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Dānijas"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norvēģijas"
+
+#: ../lib/keyboard.pm:266
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Surinama"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polijas (qwerty izvietojums)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polijas (qwertz izvietojums)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Polijas"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugāles"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanādas (Kvebeka)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumāņu (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumāņu (qwertz)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumāņu (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Krievijas"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Krievijas (fonētiskā)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Zviedrijas"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovēnijas"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovākijas (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovākijas (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Dvoraka (Norvēģijas)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Tai tastatūra"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbu (kirilica)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Surinama"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Armēnijas (fonētiskā)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Tokelau salas"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (TSCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Armēnijas (rakstāmmašīna)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tai tastatūra"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tai tastatūra"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tai tastatūra"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadžiku tastatūra"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Vācijas"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turcijas (modernais \"Q\" modelis)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turcijas (modernais \"Q\" modelis)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainas"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Surinama"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "ASV tastatūra"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "ASV tastatūra (starptautiskā)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "ASV tastatūra (starptautiskā)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Serbu (kirilica)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vjetnamas \"numuru rinda\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Dienvidslāvu (latīņu)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Labais Alt taustiņs"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Abi Shift taustiņi vienlaicīgi"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrll un Shift taustiņi vienlaicīgi"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock taustiņš"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, fuzzy, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Ctrl un Alt taustiņi vienlaicīgi"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl un Alt taustiņi vienlaicīgi"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt un Shift taustiņi vienlaicīgi"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\" taustiņš"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Kreisais \"Windows\" taustiņš"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Labais \"Windows\" taustiņš"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, fuzzy, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Abi Shift taustiņi vienlaicīgi"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, fuzzy, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Abi Shift taustiņi vienlaicīgi"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, fuzzy, c-format
 msgid "Left Shift key"
 msgstr "Kreisais \"Windows\" taustiņš"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, fuzzy, c-format
 msgid "Right Shift key"
 msgstr "Labais Alt taustiņs"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, fuzzy, c-format
 msgid "Left Alt key"
 msgstr "Labais Alt taustiņs"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, fuzzy, c-format
 msgid "Left Control key"
 msgstr "Attālināta kontrole"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, fuzzy, c-format
 msgid "Right Control key"
 msgstr "Labais Alt taustiņs"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1458,12 +1440,12 @@ msgstr ""
 "kas Jums ļaus pārslēgties starp dažādiem tastatūras\n"
 "izkārtojumiem (piemēram, latīņu un ne-latīņu)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Uzmanību"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1471,257 +1453,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - pele"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standarta"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Parasta PS2 Wheel pele"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 poga"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Parasta 2 pogu pele"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, fuzzy, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Parasta 3 pogu pele"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Ritenis"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seriāla"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Parasta 3 pogu pele"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, fuzzy, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, fuzzy, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (seriāla, vecs C7 tips)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, fuzzy, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (seriāla, vecs C7 tips)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, fuzzy, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 pogas"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 pogas"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, fuzzy, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Pogu emulācija"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, fuzzy, c-format
 msgid "Universal"
 msgstr "Pēc atinstalēšanas"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Nav peles"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "neviens"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Nav peles"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Lūdzu izvēlieties jūsu peles tipu."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "Mjanma"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Vai emulēt trešo pogu?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Peles ports"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Lūdzu izvēlieties, ar kuru seriālo portu ir saslēgta pele."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Pogu emulācija"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "2. pogas emulācija"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3. pogas emulācija"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Lūdzu notestējiet peli"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Lai aktivizētu peli,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "PAKUSTINIET RITENI!"
@@ -1785,6 +1737,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvoraka"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francijas"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polijas"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armēnijas (vecā)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Arābu"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Tai tastatūra"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - pele"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Nav peles"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Pogu emulācija"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "2. pogas emulācija"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3. pogas emulācija"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Turcijas (tradicionālais \"F\" modelis)"
 
diff --git a/po/mk.po b/po/mk.po
index b1228b1..54c04ec 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-mk\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2004-11-03 18:47+0100\n"
 "Last-Translator: Зоран Димовски <decata@mt.net.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -66,22 +66,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB или повеќе"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X сервер"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Изберете X сервер"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Конфигурација за повеќе глави"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -90,12 +90,12 @@ msgstr ""
 "Вашиот систем поддржува конфигурација за повеќе глави.\n"
 "Што сакате да направите?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Изберете големина за меморијата на Вашата графичка картичка"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -103,82 +103,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Конфигурирај ѓи сите глави одделно"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Користење Xinerama наставка"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Само конфигурација на картичката \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "По избор"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Конфигурација на Врска"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Излез"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Графичка картичка"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Монитор"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Резолуција"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Тест"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Опции"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Приклучоци"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Вашата конфигурациона датотека на Xorg е расипана, ќе ја игнорираме."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -191,32 +191,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Изберете монитор за глава број #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Изберете монитор"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Генеричен"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Производител"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -240,22 +240,22 @@ msgstr ""
 "оштетите вашиот монитор.\n"
 "  Ако не сте сигурни, изберете конзервативни подесувања."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Хоризонтална фреквенција на освежување"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Вертикална фреквенција на освежување"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Изберете акција"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -270,7 +270,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -283,84 +283,84 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 бои (8 бита)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 илјади бои (15 бита)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 илјади бои (16 бита)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 милиони бои (24 бита)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Автоматкси"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Резолуции"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Друго"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Изберете резолуција и длабочина на бои"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Графичка карта: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Во ред"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Откажи"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Помош"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Тест на конфигурацијата"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Дали сакате да ја тестирате конфигурацијата?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Внимание: тестирање на оваа графичка карта може да го замрзне компјутерот"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -371,152 +371,157 @@ msgstr ""
 "%s\n"
 "Обидете се да промените некои параметри"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Напуштам за %d секунди"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Дали се ова точните подесувања?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "ниту еден"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Распоред на тастатурата: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Распоред на тастатурата: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Тип на глувче: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Монитор: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Хоризонтална синхронизација на мониторот: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Вертикална фреквенција на освежување на мониторот: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Графичка карта: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Графичка меморија: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Длабочина на бои: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Резолуција: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg драјвер: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg конфигурација"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Графичка карта: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Графички интерфејс при подигање"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
@@ -524,7 +529,7 @@ msgstr ""
 "режим (Xorg) при подигање.\n"
 "Дали сакате да се вклучи Xorg по рестартирањето?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -545,922 +550,899 @@ msgstr ""
 "\n"
 "Дали ја имате оваа можност?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Која норма ја користи вашиот телевизор?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Чешка (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Германска"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Шпанска"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Финска"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Француска"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK тастатура"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Норвешка"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Полска"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Руска"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Шведска"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US тастатура"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Албанска"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Ерменска (стара)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Ерменска (машина)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Ерменска (фонетска)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Арабска"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Естонска"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Азербејџанска (латиница)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Белгиска"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Бенгалска (Inscript распоред)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Бенгалска (Probhat распоред)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Бугарска (фонетска)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Бугарска (БДС)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Бразилска (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Босанска"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Босанска"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Белоруска"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Швајцарска (германски распоред)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Швајцарија (француски распоред)"
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Арабска"
+"Czech (QWERTZ)"
+msgstr "Чешка (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Чешка (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Германска"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Германска (без мртви копчиња)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Девангарска"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Данска"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Норвешка)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Норвешка)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Шведска)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Шведска)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Естонска"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Шпанска"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Финска"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Грчка"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Француска"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Француска"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Грчка (Политонска)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Грчка (Политонска)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK тастатура"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgian (\"Руски\" распоред)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgian (\"Латиничен\" распоред)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Грчка"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Грчка (Политонска)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Хрватска"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Унгарска"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Ирска"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Инуктитут"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Израелска"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Израелска (фонетска)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Иранска"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Исландска"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Италијанска"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Јапонска со 106 копчиња"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kyrgyz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Корејска"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Арабска"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Латино-американска"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Леотинска"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Иранска"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Латвиска"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Малајаламска"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Македонска"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Мјанмарска (Бурмен)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Монглоска (кирилична)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Малтска (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Малтска (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Холандска"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Норвешка"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Оријска"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Полска (qwerty распоред)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Полска (qwertz распоред)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Полска"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Португалска"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Канадска (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Романска (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Романска (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Романска (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Руска"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Руска (Фонетска)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Шведска"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Словенечка"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Словачка (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Словачка (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Саами (Норвешка)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Саами (шведска/финска)"
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Тајландска"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Српска (кирилица)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Сиријска"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Сиријска (фонетска)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Телугу"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Тамилска (TSCII-распоред)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Тамилска (распоред на машина)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Тајландска"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Тајландска"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Тајландска"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Таџик"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Германска"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Турска (модерен \"Q\" модел)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Турска (модерен \"Q\" модел)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Украинска"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Оријска"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US тастатура"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US тастатура (интернационална)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US тастатура (интернационална)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Узбекистанска (кирилица)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Виетнамска QWERTY \"бројки\""
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Југословенска (латиница)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Десното Alt копче"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Двете Shift копчиња истовремено"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control и Shift истовремено"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock копче"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift и CapsLock истовремено"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl и Alt истовремено"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt и Shift истовремено"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Мени\"-копчето"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Левото \"Windows\"-копче"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Десното \"Windows\"-копче"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Двете Control копчиња истовремено"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Двете Alt копчиња истовремено"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Левото Shift копче"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Десното Shift копче"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Левото Alt копче"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Левото Ctrl копче"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Десното Ctrl копче"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1471,12 +1453,12 @@ msgstr ""
 "за префрлување од еден во друг распоред на тастатура\n"
 "(на пример: латиница и кирилица)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1484,257 +1466,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - глушец"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Стандардно"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Општ PS2 глушец со тркалце"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "Со 1 копче"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Општ со 2 копчиња"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Генеричко глувче со 3 копчиња со емулација на тркалото"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Со тркалце"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "сериски"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Општ со 3 копчиња"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan со емулација на тркалото"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Серии со емулација на тркалото"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (сериски, стар C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (сериски, стар C7) со емулација на тркалцето"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse со емулација на тркалце"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "Bus-глушец"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "Со 2 копчиња"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "Со 3 копчиња"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 Копчиња со емулација на тркалцето"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Универзална"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Било кој PS/2 и USB глушец"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Нема глушец"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ниту еден"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Нема глушец"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Ве молиме изберете го вашиот тип на глушец."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "Рачен избор"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Емулација на трето копче?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Порта за глушецот"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Ве молиме изберете на која сериска порта е поврзан вашиот глушец."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Емулација на копчиња"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Емулација на 2. копче"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Емулација на 3-то копче"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Ве молиме тестирајте го глушецот"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "За да го активирате глушецот,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ДВИЖЕТЕ ГО ТРКАЛЦЕТО!"
@@ -1800,6 +1752,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Француска"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Полска"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Ерменска (стара)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Арабска"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Тајландска"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - глушец"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Нема глушец"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Емулација на копчиња"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Емулација на 2. копче"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Емулација на 3-то копче"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Турска (традиционален \"F\" модел)"
 
diff --git a/po/mn.po b/po/mn.po
index a1a6c77..6fd1e54 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2004-01-02 00:35+0100\n"
 "Last-Translator: Sanlig Badral <Badral@openmn.org>\n"
 "Language-Team: Mongolian <openmn-core@lists.sf.net>\n"
@@ -62,34 +62,34 @@ msgstr "32 МБ"
 msgid "64 MB or more"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, fuzzy, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr "вы?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, fuzzy, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "хэмжээ аас"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -97,82 +97,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Бүх толгойг хамааралгүйгээр тохируулах"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama өргөтгөлийг хэрэглэх"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, fuzzy, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Тоноглол"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Тохир"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Холболт"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Гарах"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Систем хэмжигч"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Дүрслэл"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Тест"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Сонголтууд"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Плугин"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, fuzzy, c-format
 msgid ""
 "Keep the changes?\n"
@@ -181,32 +181,32 @@ msgid ""
 "%s"
 msgstr "Хадгалах бол г г"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Сонгох"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor"
 msgstr "Сонгох"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, fuzzy, c-format
 msgid "Plug'n Play"
 msgstr "г"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Ерөнхий"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Борлуулагч"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, fuzzy, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -223,22 +223,22 @@ msgstr ""
 "туг бол бол бол г бол вы төрөл бол аас вы\n"
 " ямх."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, fuzzy, c-format
 msgid "Horizontal refresh rate"
 msgstr "Хөндлөн"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, fuzzy, c-format
 msgid "Vertical refresh rate"
 msgstr "Босоо"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Үйлдэл сонгох"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -253,7 +253,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -266,83 +266,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 мянган өнгө (15 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 сая өнгө (24 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Автомат"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Бусад"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, fuzzy, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Сонгох"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "График карт: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Хүчингүй"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Тусламж"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, fuzzy, c-format
 msgid "Test of the configuration"
 msgstr "Тест аас"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, fuzzy, c-format
 msgid "Do you want to test the configuration?"
 msgstr "вы?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, fuzzy, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Сануулга"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -350,157 +350,162 @@ msgid ""
 "Try to change some parameters"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d секундэнд орхино"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Энэ зөв тохиргоо юу?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "аль нь ч үгүй (none)"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Гарын завсар: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Гарын завсар: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Хулганы төрөл: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, fuzzy, c-format
 msgid "Monitor: %s\n"
 msgstr "Цэс-Боловсруулагч"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, fuzzy, c-format
 msgid "Graphics card: %s\n"
 msgstr "График карт: %s"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, fuzzy, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "График карт: %s"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, fuzzy, c-format
 msgid "Color depth: %s\n"
 msgstr "Дэлгэцийн өнгө тохируулах"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, fuzzy, c-format
 msgid "Resolution: %s\n"
 msgstr "Нарийвчилал:"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg тохируулга"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "График карт: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Эхлэхэд дүрст харагдалт"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, fuzzy, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -513,922 +518,899 @@ msgid ""
 "Do you have this feature?"
 msgstr "хүрээ г вы ямх г вы?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, fuzzy, c-format
 msgid "What norm is your TV using?"
 msgstr "бол?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Чех хэл"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Герман"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr ""
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Испани хэл"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Финланд"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Франц хэл"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr ""
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Норвеги хэл"
-
-#: ../lib/keyboard.pm:195
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Польш"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Орос хэл"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Швед хэл"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr ""
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Албани"
 
-#: ../lib/keyboard.pm:201
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Армен"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Армен"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Армен"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Араб"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Эстонский"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Белги"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Тамил"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Белги"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Болгар хэл (авиа зүй)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Болгар"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Бразильский"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Босни"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Босни"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Цагаан орос хэл"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Швейцарь (Герман завсар)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Швейцарь (Франц завсар)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Араб"
+"Czech (QWERTZ)"
+msgstr "Чех хэл"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Чех хэл"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Герман"
+
+#: ../lib/keyboard.pm:208
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Герман хэл үгүй"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr ""
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Дани"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr ""
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Норвеги хэл"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Норвеги хэл"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Швед хэл"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Норвеги хэл"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Швед хэл"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Швед хэл"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Эстонский"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Испани хэл"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Финланд"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Грек"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Франц хэл"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Франц хэл"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Армен"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Армен"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr ""
+
+#: ../lib/keyboard.pm:227
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Георг Орос хэл"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Георг Латин Америк"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Грек"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Гуярати"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Гурмуки"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Кроат"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Унгар хэл"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr ""
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr ""
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Израйль (авиа зүй)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Иран"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Исланд"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Итали хэл"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Япон"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Канад"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Солонгос"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Солонгос"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Араб"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Латин Америк"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr ""
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Иран"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Латви"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr ""
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Македон"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr ""
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Монгол (крилл)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr ""
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Малт (АНУ)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Дуч хэл"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Норвеги хэл"
+
+#: ../lib/keyboard.pm:266
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Либя"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Польш"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Польш"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Польш"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Португали хэл"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr ""
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Роман"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Роман"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Роман"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Орос хэл"
+
+#: ../lib/keyboard.pm:277
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Болгар хэл (авиа зүй)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Швед хэл"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Словян хэл"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr ""
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr ""
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Норвеги хэл"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Тай"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Серби"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr ""
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Армен"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Токелау"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Тамил"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Тамил"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Тай"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Тай"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Тай"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Тажик гар"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Герман"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Турк (орчин үеийн \"Q\" загвар)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Турк (орчин үеийн \"Q\" загвар)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Украйн хэл"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Либя"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr ""
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr ""
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Дани"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Серби"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr ""
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, fuzzy, c-format
 msgid "Right Alt key"
 msgstr "Баруун Alt"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, fuzzy, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Shift"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, fuzzy, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Контрол Shift"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, fuzzy, c-format
 msgid "CapsLock key"
 msgstr "CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, fuzzy, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Ctrl болон Alt точнуудын төсөөжүүлэлт"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl болон Alt точнуудын төсөөжүүлэлт"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, fuzzy, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt Shift"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, fuzzy, c-format
 msgid "\"Menu\" key"
 msgstr "Цэс"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Зүүн \"Windows\" товч"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, fuzzy, c-format
 msgid "Right \"Windows\" key"
 msgstr "Баруун Цонхнууд"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, fuzzy, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Shift"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, fuzzy, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Shift"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, fuzzy, c-format
 msgid "Left Shift key"
 msgstr "Зүүн \"Windows\" товч"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, fuzzy, c-format
 msgid "Right Shift key"
 msgstr "Баруун Alt"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, fuzzy, c-format
 msgid "Left Alt key"
 msgstr "Баруун Alt"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, fuzzy, c-format
 msgid "Left Control key"
 msgstr "Дээд"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, fuzzy, c-format
 msgid "Right Control key"
 msgstr "Баруун Alt"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, fuzzy, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1436,12 +1418,12 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr "вы г"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Анхааруулга"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1449,257 +1431,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, fuzzy, c-format
-msgid "Sun - Mouse"
-msgstr "Ням"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Стандарт"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr ""
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, fuzzy, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Ерөнхий Дугуй"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr ""
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr ""
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr ""
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Майкрософт хөтөч"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr ""
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Ерөнхий 2 Товчтой хулгана"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, fuzzy, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Ерөнхий Товч"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Дугуй"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr ""
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, fuzzy, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Ерөнхий Товч"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr ""
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr ""
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Хулганы систем"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr ""
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM цувралууд"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr ""
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, fuzzy, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Хулгана C7 төрөл"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, fuzzy, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Хулгана C7 төрөл"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr ""
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr ""
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr ""
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, fuzzy, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Товчинууд тоолуур"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Нийтийн"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Майкрософт хөтөч"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Үгүй"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "аль нь ч үгүй (none)"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, fuzzy, c-format
 msgid "No mouse"
 msgstr "Үгүй"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, fuzzy, c-format
 msgid "Please choose your type of mouse."
 msgstr "төрөл аас."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "Хэл"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr ""
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, fuzzy, c-format
 msgid "Mouse Port"
 msgstr "Хулгана"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, fuzzy, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "бол."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Товчинууд тоолуур"
-
-#: ../lib/mouse.pm:558
-#, fuzzy, c-format
-msgid "Button 2 Emulation"
-msgstr "Товч"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Товч 3 эмуляц"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, fuzzy, c-format
 msgid "To activate the mouse,"
 msgstr "тийш"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr ""
@@ -1763,6 +1715,54 @@ msgstr ""
 #, fuzzy
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Франц хэл"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Польш"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Армен"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Араб"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Тай"
+
+#, fuzzy
+#~ msgid "Sun - Mouse"
+#~ msgstr "Ням"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Үгүй"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Товчинууд тоолуур"
+
+#, fuzzy
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Товч"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Товч 3 эмуляц"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Турк"
 
diff --git a/po/ms.po b/po/ms.po
index 61a1159..a17c5f9 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2008-05-03 00:10+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -59,34 +59,34 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB atau lebih"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Pelayan X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Pilih pelayan X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Tetapan multi-head"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -94,82 +94,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Guna sambungan Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Tetapkan hanya kad \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Tersendiri"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Konfigurasi VNC"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Keluar"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Kad Grafik"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Resolusi"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Uji"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Pilihan"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Plugin"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -178,32 +178,32 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Pilih monitor untuk paparan #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Pilih monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generik"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Pengeluar"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, fuzzy, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -220,22 +220,22 @@ msgstr ""
 "menegak dan mengufuk\n"
 " dalam."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Kadar kesegaran melintang"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Kadar kesegaran menegak"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Urus plugin"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -250,7 +250,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -263,83 +263,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 Warna (8 Bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatik"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Lain-lain"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Pilih resolusi dan kedalaman warna"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Kad grafik: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Bantuan"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Uji tetapan"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Adakah anda mahu menguji tetapan?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, fuzzy, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Amaran"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -350,157 +350,162 @@ msgstr ""
 "%s\n"
 "Cuba tukar beberapa parameter"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Meninggalkan dalam %d saat"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Adakah tetapan ini betul?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "tiada"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, fuzzy, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Satu lagi permainan kenderaan cahaya 3D"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Susunatur papan kekunci: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Susunatur papan kekunci: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Jenis tetikus: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HorizSync: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertRefresh: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Kad grafik: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memori grafik: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Kedalaman warna: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolusi: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Pemandu Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Tetapan Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Pilihan Dua-Arah"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Antaramuka bergrafik ketika permulaan"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "mula mula?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, fuzzy, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -513,922 +518,899 @@ msgid ""
 "Do you have this feature?"
 msgstr "dalam?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Papan Kekunci Pada-Skrin"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Jerman"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Sepanyol"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Pintasan Papan Kekunci"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Pintasan Papan Kekunci"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, fuzzy, c-format
-msgid "UK keyboard"
-msgstr "Pintasan Papan Kekunci"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Pintasan Papan Kekunci"
-
-#: ../lib/keyboard.pm:195
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Pintasan Papan Kekunci"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Pintasan Papan Kekunci"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Pintasan Papan Kekunci"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, fuzzy, c-format
-msgid "US keyboard"
-msgstr "Pintasan Papan Kekunci"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albania"
 
-#: ../lib/keyboard.pm:201
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Papan Kekunci Pada-Skrin"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arab"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Estonia"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Tetapkan susunatur papan kekunci"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Swiss (susunatur Perancis)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Swiss (susunatur Perancis)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
+"Czech (QWERTZ)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Jerman"
+
+#: ../lib/keyboard.pm:208
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Jerman tidak"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Sokongan Bahasa Inggeris (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonia"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Sepanyol"
+
+#: ../lib/keyboard.pm:220
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Pintasan Papan Kekunci"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Pintasan Papan Kekunci"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Papan Kekunci Pada-Skrin"
+
+#: ../lib/keyboard.pm:226
+#, fuzzy, c-format
+msgid "UK keyboard"
+msgstr "Pintasan Papan Kekunci"
+
+#: ../lib/keyboard.pm:227
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Tetapkan susunatur papan kekunci"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Tetapkan susunatur papan kekunci"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Greek"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croatia"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Icelandic"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Itali"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Kunci kekunci Lekat"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "keyboard|Arab (azerty/digit)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedonia"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burma)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Cyrillic, ISO-8859-5"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Sokongan Bahasa Inggeris (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Belanda"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Pintasan Papan Kekunci"
+
+#: ../lib/keyboard.pm:266
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Tetapkan susunatur papan kekunci"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Tetapkan susunatur papan kekunci"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugis"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Pintasan Papan Kekunci"
+
+#: ../lib/keyboard.pm:277
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Pintasan Papan Kekunci"
+
+#: ../lib/keyboard.pm:279
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Fail data Finland"
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Pintasan Papan Kekunci"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Cyrillic, ISO-8859-5"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tetapkan susunatur papan kekunci"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tetapkan susunatur papan kekunci"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "<h1>Papan kekunci</h1>"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Model pagi paparan pepohon"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Model pagi paparan pepohon"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Pintasan Papan Kekunci"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, fuzzy, c-format
+msgid "US keyboard"
+msgstr "Pintasan Papan Kekunci"
+
+#: ../lib/keyboard.pm:314
 #, fuzzy, c-format
 msgid "US keyboard (international)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Papan Kekunci Pada-Skrin"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Cyrillic, ISO-8859-5"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr ""
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Papan Kekunci Pada-Skrin"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, fuzzy, c-format
 msgid "Right Alt key"
 msgstr "Gugusan Kunci OpenPGP"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, fuzzy, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Kedua-dua kekunci Shift serentak menukarkan kumpulan"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, fuzzy, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "dan Shif"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, fuzzy, c-format
 msgid "CapsLock key"
 msgstr "Kekunci Pintasan"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, fuzzy, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Ctrl dan Alt"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, fuzzy, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl dan Alt"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, fuzzy, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt dan Shif"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, fuzzy, c-format
 msgid "\"Menu\" key"
 msgstr "Kekunci Pintasan"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, fuzzy, c-format
 msgid "Left \"Windows\" key"
 msgstr "Gugusan Kunci OpenPGP"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, fuzzy, c-format
 msgid "Right \"Windows\" key"
 msgstr "Gugusan Kunci OpenPGP"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, fuzzy, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Kedua-dua kekunci Alt menukarkan kumpulan"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, fuzzy, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Kedua-dua kekunci Alt menukarkan kumpulan"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, fuzzy, c-format
 msgid "Left Shift key"
 msgstr "Gugusan Kunci OpenPGP"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, fuzzy, c-format
 msgid "Right Shift key"
 msgstr "Gugusan Kunci OpenPGP"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, fuzzy, c-format
 msgid "Left Alt key"
 msgstr "Gugusan Kunci OpenPGP"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, fuzzy, c-format
 msgid "Left Control key"
 msgstr "Gugusan Kunci OpenPGP"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, fuzzy, c-format
 msgid "Right Control key"
 msgstr "Gugusan Kunci OpenPGP"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, fuzzy, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1436,12 +1418,12 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr "dan"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Amaran"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1449,257 +1431,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, fuzzy, c-format
-msgid "Sun - Mouse"
-msgstr "Seting tetikus"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Piawai"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, fuzzy, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Bola tetikus skrol dengan:"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, fuzzy, c-format
 msgid "1 button"
 msgstr "Gaya Butang"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, fuzzy, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Tetikus diatas ikan"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, fuzzy, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Generik"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Roda"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "bersiri"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, fuzzy, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Tetikus diatas ikan"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, fuzzy, c-format
 msgid "Logitech CC Series"
 msgstr "Siri CC (bersiri)"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, fuzzy, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (bersiri, jenis C7 lama)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, fuzzy, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (bersiri, jenis C7 lama)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr ""
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, fuzzy, c-format
 msgid "2 buttons"
 msgstr "Butang Mdk"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, fuzzy, c-format
 msgid "3 buttons"
 msgstr "Butang Mdk"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, fuzzy, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Font pada butang dengan teks."
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, fuzzy, c-format
 msgid "Force evdev"
 msgstr "Paksa teks LTR"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Boot Microsoft Windows"
 
-#: ../lib/mouse.pm:89
-#, fuzzy, c-format
-msgid "VirtualBox mouse"
-msgstr "Seting tetikus"
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Seting tetikus"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "tiada"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, fuzzy, c-format
 msgid "No mouse"
 msgstr "Seting tetikus"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, fuzzy, c-format
 msgid "Testing the mouse"
 msgstr "Seting tetikus"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, fuzzy, c-format
 msgid "Please choose your type of mouse."
 msgstr "Sila pilih jenis logmasuk anda:"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "Seting tetikus"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, fuzzy, c-format
 msgid "Emulate third button?"
 msgstr "Emulasikan klik 3 butang"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, fuzzy, c-format
 msgid "Mouse Port"
 msgstr "Seting tetikus"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, fuzzy, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "bersiri."
 
-#: ../lib/mouse.pm:556
-#, fuzzy, c-format
-msgid "Buttons emulation"
-msgstr "Butang Mdk"
-
-#: ../lib/mouse.pm:558
-#, fuzzy, c-format
-msgid "Button 2 Emulation"
-msgstr "Gaya Butang"
-
-#: ../lib/mouse.pm:559
-#, fuzzy, c-format
-msgid "Button 3 Emulation"
-msgstr "Gaya Butang"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, fuzzy, c-format
 msgid "Please test the mouse"
 msgstr "Tetikus diatas ikan"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, fuzzy, c-format
 msgid "To activate the mouse,"
 msgstr "Tetikus diatas ikan"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, fuzzy, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "Pasukan Mandriva Anda."
@@ -1761,6 +1713,65 @@ msgstr "Konfigurasi VNC"
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Pintasan Papan Kekunci"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Pintasan Papan Kekunci"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Papan Kekunci Pada-Skrin"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Papan Kekunci Pada-Skrin"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Pintasan Papan Kekunci"
+
+#, fuzzy
+#~ msgid "Sun - Mouse"
+#~ msgstr "Seting tetikus"
+
+#, fuzzy
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Seting tetikus"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Seting tetikus"
+
+#, fuzzy
+#~ msgid "Buttons emulation"
+#~ msgstr "Butang Mdk"
+
+#, fuzzy
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Gaya Butang"
+
+#, fuzzy
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Gaya Butang"
+
 #, fuzzy
 #~ msgid ""
 #~ "_: keyboard\n"
diff --git a/po/mt.po b/po/mt.po
index 1883d9d..5b67b5d 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2004-10-04 18:45+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@li.org>\n"
@@ -62,22 +62,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB jew iżjed"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Agħżel server X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Konfigurazzjoni multi-head"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -86,12 +86,12 @@ msgstr ""
 "Is-sistema tiegħek tissapporti konfigurazzjoni \"multi-head\".\n"
 "Xi trid tagħmel?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Agħżel id-daqs tal-memorja tal-kard tal-grafika"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -99,82 +99,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Ikkonfigura l-heads kollha independentement"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Uża estensjoni Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Ikkonfigura l-kard \"%s\"%s biss"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personalizzat"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Konfigurazzjoni tal-konnessjoni"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Noħroġ"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Kard grafika"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Skrin"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Reżoluzzjoni"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Ittestja"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Għażliet"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Plagins"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Il-konfigurazzjoni Xorg hija ħażina - se ninjorawha."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -187,32 +187,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Agħżel skrin għal \"head\" #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Agħżel skrin"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Ġeneriku"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Manifattur"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -237,22 +237,22 @@ msgstr ""
 "kapaċi juri l-iskrin tiegħek, għax tista' tagħmillu l-ħsara.\n"
 "Jekk għandek xi dubju, agħżel valur żgħir."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Frekwenza orizzontali"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Frekwenza vertikali"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Agħżel azzjoni"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -267,7 +267,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -280,83 +280,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 kuluri (8 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 elf kulur (15 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 elf kulur (16 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miljun kulur (24 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Awtomatiku"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Reżoluzzjonijiet"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Oħrajn"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Agħżel reżoluzzjoni u finezza ta' kuluri"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Kard grafika: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Ikkanċella"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Għajnuna"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Test tal-konfigurazzjoni"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Trid tittestja din il-konfigurazzjoni?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Twissija: it-test ta' din il-kard grafika jista' jwaħħal il-kompjuter"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -367,159 +367,164 @@ msgstr ""
 "%s\n"
 "Ipprova ibdel xi parametri"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Ħiereġ f' %d sekondi"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Dan huwa s-seting tajjeb?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "ebda"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "yes"
 msgstr "Iva"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tqassim tat-tastiera: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tqassim tat-tastiera: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tip ta' maws: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Skrin: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Frek.Orizzontali Skrin: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Frek. Vertikali Skrin: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Kard grafika: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memorja grafika: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Numru ta' kuluri: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Reżoluzzjoni: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Drajver Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Konfigurazzjoni Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, fuzzy, c-format
 msgid "Global options"
 msgstr "Għażliet tal-modulu:"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Kard grafika: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X fil-bidu"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Nista' nissettja l-kompjuter biex awtomatikament jidħol f' X malli jitla'.\n"
 "Trid ittella' X Windows meta tixgħel?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -540,922 +545,899 @@ msgstr ""
 "\n"
 "Għandek din il-faċilità?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Liema standard juża t-TV tiegħek?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Ċekk (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Ġermaniż"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spanjol"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finlandiż"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Franċiż"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Renju Unit"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norveġiż"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Pollakk"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Russu"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Svediż"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Stati Uniti"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albaniż"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armen (antik)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armen (tajprajter)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armen (fonetiku)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Għarbi"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Estonjan"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Ażeri (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belġjan"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (tqassim Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (tqassim Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgaru (fonetiku)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgaru (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brażiljan (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bożnian"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Bożnian"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Bjelorussu"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Svizzeru (tqassim Ġermaniż)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Svizzeru (tqassim Franċiż)"
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Għarbi"
+"Czech (QWERTZ)"
+msgstr "Ċekk (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Ċekk (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Ġermaniż"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Ġermaniż (bla deadkeys)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Daniż"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Norveġiż)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norveġiż)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Svediż)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Svediż)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonjan"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spanjol"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finlandiż"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Grieg"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Franċiż"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Franċiż"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Grieg (politoniku)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Grieg (politoniku)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Renju Unit"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Ġorġjan (tqassim \"Russu\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Ġorġjan (tqassim \"Latin\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grieg"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grieg (politoniku)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Guġarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukħi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroat"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungeriż"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irlandiż"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Iżraeli"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Iżraeli (fonetiku)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranjan"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandiż"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Taljan"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Ġappuniż 106 buttuna"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgiż"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korean"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Għarbi"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latin Amerikan"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotjan"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Iranjan"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latvjan"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malajalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Maċedonjan"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Mjanmar (Burmiż)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongoljan (ċirilliku)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Malti"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Malti (tqassim US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Olandiż"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norveġiż"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Orija"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Pollakk (qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Pollakk (qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pollakk"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugiż"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadiż (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumen (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumen (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumen (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Russu"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Russu (fonetiku)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Svediż"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Sloven"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakk (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakk (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Norveġiż)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (svediż/finlandiż)"
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Tajlandiż"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serb (ċirilliku)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Sirjakk"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Sirjakk (fonetiku)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (tajprajter)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tajlandiż"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tajlandiż"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tajlandiż"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Taġik"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Ġermaniż"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Tork (mudell modern \"Q\")"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Tork (mudell modern \"Q\")"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukranjan"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Orija"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Stati Uniti"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Tastiera US (internazzjonali)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Tastiera US (internazzjonali)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Użbeki (ċirilliku)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vjetnamiż qwerty \"numeric row\""
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslav (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Tast Alt tal-lemin"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Iż-żewġ tasti \"shift\" flimkien"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrl u Shift flimkien"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Tast CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift u CapsLock flimkien"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl u Alt flimkien"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt u Shift flimkien"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Tast Menu"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Tast Windows tax-xellug"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Tast Windows tal-lemin"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Iż-żewġ tasti Ctrl flimkien"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Iż-żewġ tasti Alt flimkien"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Tast Shift tax-xellug"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Tast Shift tal-lemin"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Tast Alt tal-lemin"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Tast Ctrl tax-xellug"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Tast Ctrl tal-lemin"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1466,12 +1448,12 @@ msgstr ""
 "li jħalluk tibdel minn tqassim għal ieħor tat-tastiera \n"
 "(eż. latin u mhux latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Twissija"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1482,257 +1464,227 @@ msgstr ""
 "Waqt l-installazzjoni, trid tuża t-tast Ctrl tal-lemin\n"
 "biex taqleb minn tqassim għall-ieħor."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Maws - Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Maws bir-rota ġeneriku PS2"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "buttuna waħda"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Ġeneriku 2 buttuni"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Maws ġeneriku bi 3 buttuni u emulazzjoni tar-rota"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rota"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serjali"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Ġeneriku 3 buttuni"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan b'emulazzjoni tar-rota"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series b'emulazzjoni tar-rota"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Maws Logitech (serjali, tip C7 antik)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Maws Logitech (serjali, tip C7 antik) b'emulazzjoni tar-rota"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse b'emulazzjoni tar-rota"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 buttuni"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 buttuni"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 buttuni b' emulazzjoni tar-rota"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universali"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Kwalinkwa maws PS/2 u USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Varji"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ebda"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Ebda maws"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Jekk jogħġbok agħżel it-tip tal-maws."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "Għażla manwali"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emula t-tielet buttuna?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Port tal-maws"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Jekk jogħġbok agħżel il-port serjali li miegħu hemm imqabbad il-maws."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulazzjoni tal-buttuni"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulazzjoni ta' buttuna #2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulazzjoni ta' buttuna #3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Jekk jogħġbok ittestja l-maws"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Biex tħaddem il-maws"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MEXXI R-ROTA!"
@@ -1797,6 +1749,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Franċiż"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Pollakk"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armen (antik)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Għarbi"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Tajlandiż"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Maws - Sun"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Varji"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulazzjoni tal-buttuni"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulazzjoni ta' buttuna #2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulazzjoni ta' buttuna #3"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Tork (mudell tradizzjonali \"F\")"
 
diff --git a/po/nb.po b/po/nb.po
index 04817fc..42224d9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2018-02-14 18:14+0000\n"
 "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/"
@@ -72,22 +72,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB eller mer"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X-server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Velg en X-server"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-hode-oppsett"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -96,12 +96,12 @@ msgstr ""
 "Systemet ditt støtter oppsett for flere hoder.\n"
 "Hva ønsker du å gjøre?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Velg minnestørrelsen til grafikk-kortet ditt"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -112,7 +112,7 @@ msgstr ""
 "ekstra finesser.\n"
 "Ønsker du å bruke den?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -121,75 +121,75 @@ msgstr ""
 "Den proprietære driveren ble ikke ordentlig installert. Bruker derfor den "
 "frie driveren."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Sett opp alle hoder uavhengig"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Bruk Xinerama utvidelse"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Sett bare opp kort «%s»%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Skreddersydd"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Skjermkort- og skjermoppsett"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafikk-kort"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Skjerm"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Valg"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Programtillegg"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Xorg-oppsettsfilen er ødelagt, den vil bli ignorert."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -202,32 +202,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Velg en skjerm for hode #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Velg en monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generisk"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Leverandør"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -252,22 +252,22 @@ msgstr ""
 "skjermen din.\n"
 " Hvis du er usikker, velg en konservativ innstilling."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horisontal oppfrisknings-rate"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikal oppfrisknings-rate"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Velg programtillegg"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -292,7 +292,7 @@ msgstr ""
 "ved å gå til \"Sett opp den Grafiske serveren\" i Mageia kontrollsenteret og "
 "velg ditt grafikkort der."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -313,83 +313,83 @@ msgstr ""
 "\"Installer og avinnstaller programvare\" og installer \"firmware\" pakken "
 "og rekonfigurer grafikkortet."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 farger (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tusen farger (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tusen farger (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 millioner farger (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Oppløsning"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Andre"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Velg oppløsning og fargedybde"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafikk-kort: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Test av oppsettet"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Vil du teste oppsettet?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Advarsel: testing av dette grafikkortet kan `fryse' maskinen din"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -400,159 +400,164 @@ msgstr ""
 "%s\n"
 "Prøv å endre på noen parametre"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Forlater om %d sekunder"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Er dette riktig oppsett?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Slå av Ctrl + Alt + Rettetast: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "nei"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "ja"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D-maskinvareakselerasjon %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastaturoppsett: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tastaturoppsett: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Musetype: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Skjerm: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Skjerm HorizSync: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Skjerm VertRefresh: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Skjermkort: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafikkminne: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Fargedybde: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Oppløsning: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg-driver: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg-oppsett"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Globale valg"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Slå av Ctrl + Alt + Rettetast"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Skjermkortvalg"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Aktiver gjennomsiktighet (Composite-utvidelse)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Bruk maskinvareakselerert musepeker"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Aktiver RENDER-akselerasjon (dette kan forårsake problemer med visning av "
 "tekst)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Aktiver duplikatskjermbilde på ekstern skjerm"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Aktiver duplikatskjermbilde på andre skjerm"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Tving visningsmodus for DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Aktiver BIOS-hurtigtaster for bytte av ekstern skjerm"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Bruk EXA i stedet for XAA (bedre ytelse for Render og Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Grafisk grensesnitt under oppstart"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Automatisk start  av det grafiske grensesnittet (Xorg) ved oppstart"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -573,134 +578,47 @@ msgstr ""
 "\n"
 "Har du dette?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Hva slags norm bruker TV'en din?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "annet"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tsjekkisk (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Tysk"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spansk"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finsk"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Fransk"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK-tastatur"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norsk"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polsk"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Russisk"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Svensk"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US-tastatur"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albansk"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armensk (gammelt)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armensk (skrivemaskin)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armensk (fonétisk)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabisk"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -709,189 +627,219 @@ msgstr ""
 "_:keybord\n"
 "Asturisk"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjansk (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgisk"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalsk (Inscript oppsett)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalsk (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgarsk (fonétisk)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgarsk (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasiliansk (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnisk"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetan"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Hviterussisk"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Sveitsisk (tysk oppsett)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Sveitsisk (fransk oppsett)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Tsjekkisk (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tsjekkisk (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Tysk"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Tysk (ingen døde taster)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dansk"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Fransk)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (Britisk)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norsk)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polsk)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Svensk)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estlandsk"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spansk"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finsk"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faroese"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr ""
+"_:keybord\n"
+"Fransk (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -900,303 +848,324 @@ msgstr ""
 "_:keybord\n"
 "Fransk (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr ""
 "_:keybord\n"
 "Fransk (Bepo, kun latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr ""
+"_:keybord\n"
+"Fransk (Bepo, kun latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK-tastatur"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgisk («Russisk» oppsett)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgisk («Latinsk» oppsett)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Gresk"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Gresk (polytonisk)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroatisk"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungarsk"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irsk"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelsk"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelsk (fonétisk)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iransk"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandsk"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italiensk"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japansk 106 taster"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kyrgyz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Koreansk"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdisk (arabisk skript)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latinamerikansk"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laot"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litauisk"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latvisk"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malaysisk"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonsk"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmesisk)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolsk (cyrillic)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltesisk (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltesisk (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeriansk"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Nederlandsk"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norsk"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polsk (qwerty oppsett)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polsk (qwertz oppsett)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugisisk"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadisk (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romansk (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romansk (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1205,154 +1174,161 @@ msgstr ""
 "_:keybord\n"
 "Romansk (basis)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Russisk"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Russisk (fonétisk)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Svensk"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovensk"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakisk (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakisk (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Samisk (norsk)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Samisk (svensk/finsk)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbisk (cyrillic)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syrisk"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syrisk (fonétisk)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamilsk (ISCII-oppsett)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamilsk (skrivemaskinoppsett)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (marokansk oppsett)(+latinsk/arabisk)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonétisk) (+latinsk/arabisk)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajik-tastatur"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmensk"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1361,7 +1337,7 @@ msgstr ""
 "_:keybord\n"
 "Tyrkisk (\"F\" modell)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1370,137 +1346,147 @@ msgstr ""
 "_:keybord\n"
 "Tyrkisk (\"Q\" modell)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainsk"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu-tastatur"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US-tastatur"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US-tastatur (internasjonalt)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US-tastatur (internasjonalt)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO 9995-3 (USA-tastatur med 3 nivå per tast)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Usbekistansk (cyrillic)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamesisk «nummerrekke» QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslavisk (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Høyre Alt-tast"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Begge Shift-taster samtidig"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control- og Shift-taster samtidig"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock-tast"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift- og CapsLock-taster samtidig"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl- og Alt-taster samtidig"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt- og Shift-taster samtidig"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Meny\"-tast"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Venstre «Windows»-tast"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Høyre «Windows»-tast"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Begge Control-taster samtidig"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Begge Alt-taster samtidig"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Venstre Shift-tast"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Høyre Shift-tast"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Venstre Alt-tast"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Venstre Control-tast"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Høyre Control-tast"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1511,12 +1497,12 @@ msgstr ""
 "å bytte mellom forskjellige tastaturoppsett.\n"
 "(for eksempel latin og ikke-latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1527,257 +1513,227 @@ msgstr ""
 "Under installasjonen så vil du måtte bruke høyre CTRL-tast\n"
 "for å svitsje mellom de forskjellige tastaturoppsettene."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Mus"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Generisk PS2 hjulmus"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 knapp"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Generisk 2-knappers mus"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Generisk 3-knappers mus med hjulemulering"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Hjul"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seriell"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Generisk 3-knappers mus"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan med hjulemulering"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC-Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC-Series med hjulemulering"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM-seriene"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech mus (seriell, gammel C7 type)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech mus (seriell, gammel C7-type) med hjulemulering"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse med hjulemulering"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "bussmus"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 knapper"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 knapper"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 knapper med hjulemulering"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universiell"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Alle PS/2 & USB mus"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Tving evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox-kontroller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox-mus"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware-mus"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ingen"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Ingen mus"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Tester musa"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Velg din musetype."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Musevalg"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emulere tredje knapp?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Museport"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Velg hvilken serieport musen din er koblet til."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Museknappemulering"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Museknapp 2-emulering"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Museknapp 3-emulering"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Test musa."
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "For å aktivere musa,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "BEVEG HJULET DITT!"
@@ -1835,3 +1791,51 @@ msgstr "Kjør Mageia Grafiske Konfigurator"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "Autentisering kreves for å kjøre Mageia Grafiske konfigurator"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Fransk"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polsk"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armensk (gammelt)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Mus"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox-mus"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware-mus"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Museknappemulering"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Museknapp 2-emulering"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Museknapp 3-emulering"
diff --git a/po/nl.po b/po/nl.po
index 71b7e89..ca3e9aa 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-06-15 22:26+0200\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Dutch <i18n-nl@ml.mageia.org>\n"
@@ -68,22 +68,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB of meer"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X-server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Kies een X-server"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-koppen instelling"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -92,12 +92,12 @@ msgstr ""
 "Uw computer ondersteunt een instelling met meerdere koppen.\n"
 "Want wenst u te doen?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Selecteer de geheugengrootte van uw grafische kaart"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -108,7 +108,7 @@ msgstr ""
 "die extra functionaliteit ondersteunt.\n"
 "Wilt u deze gebruiken?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -117,75 +117,75 @@ msgstr ""
 "Het fabrikantseigen stuurprogramma is niet correct geïnstalleerd. Het "
 "standaard vrije software-stuurprogramma zal worden gebruikt."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Alle koppen afzonderlijk configureren"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama-uitbreiding gebruiken"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Alleen kaart \"%s\"%s configureren"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Aangepast"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Configuratie van grafische kaart & monitor"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Afsluiten"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafische kaart"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Beeldscherm"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opties"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Uw Xorg-configuratiebestand is kapot, we negeren het."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -198,32 +198,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Selecteer een monitor voor head #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Selecteer een monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Algemeen"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Fabrikant"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -248,22 +248,22 @@ msgstr ""
 "van uw monitor overschrijdt: u kan uw monitor beschadigen.\n"
 "Bij twijfel maak een voorzichtige keuze."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horizontale verversingsfrequentie"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Verticale verversingsfrequentie"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Plug-ins kiezen"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -290,7 +290,7 @@ msgstr ""
 "opnieuw in door nogmaals uw videokaart in te stellen onder \"Apparatuur\" "
 "van het configuratiecentrum."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -314,85 +314,85 @@ msgstr ""
 "nogmaals uw videokaart in te stellen onder \"Apparatuur\" van het "
 "configuratiecentrum."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 kleuren (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32.000 kleuren (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65.000 kleuren (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miljoen kleuren (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Resoluties"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Overig"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Kies resolutie en kleurdiepte"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafische kaart: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Hulp"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Instelling Testen"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Wenst u de instellingen te testen?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Waarschuwing: het testen van deze grafische kaart zou uw computer kunnen "
 "laten vastlopen"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -403,159 +403,164 @@ msgstr ""
 "%s\n"
 "U kunt proberen om sommige instellingen te veranderen"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Springt terug over %d seconden"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Is dit de correcte instelling?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Ctrl-Alt-Backspace uitschakelen: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "nee"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "ja"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D hardware-versnelling: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Toetsenbordindeling: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Toetsenbordindeling: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Muistype: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Beeldscherm: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Horizontale sync beeldscherm: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Verticale frequentie beeldscherm: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafische kaart: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Videogeheugen: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Kleurdiepte: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolutie: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg stuurprogramma: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg instellingen"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Globale opties"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Ctrl-Alt-Backspace uitschakelen"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opties voor grafische kaart"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Doorschijnendheid inschakelen (Composite-uitbreiding)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Hardwarematig versnelde muiscursor gebruiken"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "RENDER-acceleratie inschakelen (dit kan tot fouten leiden in tekstweergave)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Duplicaatweergave op externe monitor inschakelen"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Duplicaatweergave op tweede beeldscherm inschakelen"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Weergavemodus van DVI afdwingen"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Externe monitor-omschakeling via BIOS-sneltoets inschakelen"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 "EXA in plaats van XAA gebruiken (betere prestaties voor Render en Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Grafisch gebruiksoppervlak bij opstarten"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "De grafische omgeving (Xorg) automatisch starten na de opstartfase"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -576,12 +581,12 @@ msgstr ""
 "\n"
 "Heeft u deze mogelijkheid?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Welke norm gebruikt uw TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
@@ -590,910 +595,887 @@ msgstr ""
 "_:ongebruikelijke beeldverhouding\n"
 "overige"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tsjechisch (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Duits"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spaans"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Fins"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Frans"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK toetsenbord"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Noors"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Pools"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Russisch"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Zweeds"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "VS toetsenbord"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanees"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armeens (oud)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armeens (typmachine)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armeens (fonetisch)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabisch"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Asturisch"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbeidzjan (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgisch"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (Inscript layout)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (Probhat layout)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgaars (fonetisch)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgaars (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Braziliaans (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnisch"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetaans"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Wit-Russisch"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Zwitsers (Duitse layout)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Zwitsers (Franse layout)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee lettergrepen"
+"Czech (QWERTZ)"
+msgstr "Tsjechisch (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tsjechisch (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Duits"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Duits (geen dode toetsen)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Deens"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Frans)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Noorwegen)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Pools)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Zweeds)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Ests"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spaans"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Fins"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faeröers"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Frans (Bépo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Frans (Bépo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Frans (Bépo, enkel latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Frans (Bépo, enkel latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK toetsenbord"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgisch (\"Russische\" layout)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgisch (\"Latin\" layout)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grieks"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grieks (polytoon)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroatisch"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hongaars"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Iers"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelisch"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelisch (Fonetisch)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iraans"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "IJslands"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italiaans"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japans 106 toetsen"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgizisch toetsenbord"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Koreaans toetsenbord"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Koerdisch (Arabisch schrift)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latijns-Amerikaans"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotiaans"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litouws"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Lets"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedonisch"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Birmees)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongools (cyrillisch)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltees (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltees (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeriaans"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Nederlands (vrij zeldzaam)"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Noors"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Pools (qwerty layout)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Pools (qwertz layout)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugees"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canadees (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Roemeens (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Roemeens (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Roemeens (basis-)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Russisch"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Russisch (Phonetisch)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Zweeds"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Sloveens"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovaaks (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slowaaks (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Noors)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (Zweeds/Fins)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Servisch (cyrillisch)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syrisch"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syrisch (fonetisch)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (TSCII lay-out)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (Typemachine lay-out)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thais (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thais (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thais (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (marokkaanse indeling) (+latijn/arabisch)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonetisch) (+latijn/arabisch)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadzjikisch"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmeens"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turks (\"F\"-model)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turks (\"Q\"-model)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Oekraïens"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu-toetsenbord"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "VS toetsenbord"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "VS toetsenbord (internationaal)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "VS toetsenbord (internationaal)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (VS-toetsenbord met 3 niveaus per toets)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Oezbekisch (cyrillisch)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamese \"nummer-rij\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Joegoslavisch (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Rechter Alt-knop"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Beide Shift-toetsen tegelijkertijd"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control- en Shift-toetsen tegelijkertijd"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock-toets"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift- en CapsLock-toetsen tegelijkertijd"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl- en Alt-toetsen tegelijkertijd"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt- en Shift-toetsen tegelijkertijd"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\"-toets"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Linker \"Windows\"-toets"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Rechter \"Windows\"-toets"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Beide Control-toetsen tegelijkertijd"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Beide Alt-toetsen tegelijkertijd"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Linker Shift-toets"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Rechter Shift-knop"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Linker Alt-knop"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Linker Control-toets"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Rechter Control-knop"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1504,12 +1486,12 @@ msgstr ""
 "schakelen tussen verschillende toetsenbordlay-outs\n"
 "mogelijk maakt (bijv.: Latijn en niet-Latijn)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1520,257 +1502,227 @@ msgstr ""
 "Tijdens de installatie heeft u de rechter Control-toets nodig\n"
 "om tussen de verschillende toetsenbord-layouts te schakelen."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - muis"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standaard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Algemene PS/2 wielmuis"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 knop"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Algemene 2-knopsmuis"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Algemene drieknopsmuis met wiel-emulatie"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Wiel"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seriëel"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Algemene 3-knopsmuis"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan met wiel-emultatie"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series met wiel-emulatie"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech-muis (seriëel, oud C7-type)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech-muis (seriëel, oud C7-type) met wiel-emulatie"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse met wiel-emulatie"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmuis"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 knoppen"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 knoppen"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Drie knoppen met wiel-emulatie"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universeel"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Iedere PS/2 & USB-muis"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Evdev afdwingen"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox-muis"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware-muis"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "geen"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Geen muis"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Muistest"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Kies uw type muis alstublieft."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Muiskeuze"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Derde knop nabootsen?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Muispoort"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Met welke seriële poort is uw muis verbonden?"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Knoppenemulatie"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Knop 2-emulatie"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Knop 3-emulatie"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Test uw muis alstublieft"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Om de muis te activeren,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "BEWEEG UW WIELTJE!"
@@ -1833,6 +1785,54 @@ msgstr "Authenticatie is nodig om Mageia's Grafische Configuratie te starten"
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Frans"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Pools"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armeens (oud)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee lettergrepen"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - muis"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox-muis"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware-muis"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Knoppenemulatie"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Knop 2-emulatie"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Knop 3-emulatie"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Turks (traditioneel \"F\"-model)"
 
diff --git a/po/nn.po b/po/nn.po
index 92ebdbd..42ab2c9 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2009-10-24 10:43+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -60,22 +60,22 @@ msgstr "32 MiB"
 msgid "64 MB or more"
 msgstr "64 MiB eller meir"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X-tenar"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Vel X-tenar"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Fleirhovudoppsett"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -84,12 +84,12 @@ msgstr ""
 "Systemet ditt støttar fleirhovudoppsett.\n"
 "Kva vil du gjera?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Vel minnestorleik til skjermkortet"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -101,7 +101,7 @@ msgstr ""
 "Ønskjer du å bruka han?"
 
 # skip-rule: passiv
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -110,75 +110,75 @@ msgstr ""
 "Den ikkje-frie drivaren vart ikkje skikkeleg installert. Brukar derfor den "
 "frie drivaren."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Set opp alle hovuda for seg"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Bruk Xinerama-utviding"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Set berre opp kortet «%s»%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Sjølvvald"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Skjem- og skjermkortoppsett"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Skjermkort"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Skjerm"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Oppløysing"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Val"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Programtillegg"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Xorg-oppsettfila er øydelagt, og vert derfor ikkje brukt."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -191,32 +191,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Vel skjerm for hovud %d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Vel skjerm"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Finn automatisk"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generell"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Merke"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -238,22 +238,22 @@ msgstr ""
 "større enn skjermen din tåler, då dette kan øydeleggja skjermen.\n"
 "Er du i tvil bør du derfor velja eit lågt frekvensområde."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Vassrett frekvens"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Loddrett frekvens"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Vel programtillegg"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -268,7 +268,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -281,83 +281,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 fargar (8 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tusen fargar (15 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tusen fargar (16 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 millionar fargar (24 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Oppløysingar"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Anna"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Vel oppløysing og fargedjupn"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Skjermkort: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Test av oppsett"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Vil du testa dette oppsettet?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Åtvaring: Test av dette skjermkortet kan låsa maskina"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -368,157 +368,162 @@ msgstr ""
 "%s\n"
 "Prøv å endra nokre parametrar."
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Forlèt om %d sekund"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Er dette rett innstilling?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Gjer «Ctrl + Alt + Rettetast» uverksam: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "nei"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "ja"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D-maskinvareakselerasjon: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tastaturoppsett: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tastaturoppsett: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Mustype: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Skjerm: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Vassrett frekvens: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Loddrett frekvens: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Skjermkort: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Minne: %s KiB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Fargedjupn: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Oppløysing: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg-drivar: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg-oppsett"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Globale val"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Gjer «Ctrl + Alt + Rettetast» uverksam"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Skjermkortval"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Slå på gjennomsikt (Composite-utvidinga)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Bruk maskinvareakselerert muspeikar"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Bruk RENDER-akselerering (kan føra til feil ved vising av tekst)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Slå på skjermbiletkopi på ekstern skjerm"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Slå på skjermbiletkopi på skjerm 2"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Tving skjermmodus til DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Slå på BIOS-tast for eksternt skjermbyte"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Bruk EXA i staden for XAA (betre yting for Render og Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Grafisk oppstart"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Start automatisk det grafiske grensesnittet (Xorg) ved oppstart"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -539,922 +544,899 @@ msgstr ""
 "\n"
 "Ønskjer du denne funksjonen?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Kva fjernsynsstandard brukar fjernsynet ditt?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "anna"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tsjekkisk (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Tysk"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spansk"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finsk"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Fransk"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Britisk tastatur"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norsk"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polsk"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Russisk"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Svensk"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "USA-tastatur"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albansk"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armensk (gammal)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armensk (skrivemaskin)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armensk (fonetisk)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabisk"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Estisk"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Aserbajdsjansk (latinsk)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgisk"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (Inscript-oppsett)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (Probhat-oppsett)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgarsk (fonetisk)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgarsk (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Bulgarsk (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnisk"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/tibetansk"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Kviterussisk"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Sveitsisk (tysk oppsett)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Sveitsisk (fransk oppsett)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokerisk (syllabisk)"
+"Czech (QWERTZ)"
+msgstr "Tsjekkisk (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tsjekkisk (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Tysk"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Tysk (utan dødtastar)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dansk"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (USA)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (fransk)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (britisk)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (norsk)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (polsk)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (svensk)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estisk"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spansk"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finsk"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Færøysk"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Fransk"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Fransk"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Gresk (polytonal)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Gresk (polytonal)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Britisk tastatur"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgisk (russisk oppsett)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgisk (latinsk oppsett)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Gresk"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Gresk (polytonal)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroatisk"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungarsk"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irsk"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuittisk"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelsk"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelsk (fonetisk)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iransk"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandsk"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italiensk"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japansk – 106-tastar"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgisisk"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Koreansk"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdisk (arabiske skriftteikn)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latin-Amerika"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotisk"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litauisk"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latvisk"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonsk"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Burmesisk"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolsk (kyrillisk)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltesisk (Storbritannia)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltesisk (USA)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeriansk"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Nederlandsk"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norsk"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polsk (QWERTY-oppsett)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polsk (QWERTZ-oppsett)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugisisk"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadisk (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumensk (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romansk (QWERTZY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumensk (QWERTZ)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Russisk"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Russisk (fonetisk)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Svensk"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovensk"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Singalesisk"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovensk (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovensk (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Samisk (norsk)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Samisk (finsk/svensk)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbisk (kyrillisk)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syrisk"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syrisk (fonetisk)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII-oppsett)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (skrivemaskin-oppsett)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (marokkansk oppsett) (+ latinsk og arabisk)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonetisk) (+ latinsk og arabisk)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadsjikisk"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmensk"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Tyrkisk (moderne Q-modell)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Tyrkisk (moderne Q-modell)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainsk"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu-tastatur"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "USA-tastatur"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "USA-tastatur (internasjonalt)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "USA-tastatur (internasjonalt)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO 9995-3 (USA-tastatur med 3 nivå per tast)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Usbekisk (kyrillisk)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamesisk talrad-QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Serbisk (latinsk alfabet)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "«Alt Gr»"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Begge «Shift»-tastane samtidig"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "«Ctrl» og «Shift» samtidig"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "«Caps Lock»"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "«Shift» og «Caps Lock» samtidig"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "«Ctrl» og «Alt» samtidig"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "«Alt» og «Shift» samtidig"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "«Meny»"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Venstre «Windows»-tast"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Høgre «Windows»-tast"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Begge «Ctrl»-tastane samtidig"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Begge «Alt»-tastane samtidig"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Venstre «Shift»-tast"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Høgre «Shift»-tast"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Venstre «Alt»-tast"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Venstre «Ctrl»-tast"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Høgre «Ctrl»-tast"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1464,12 +1446,12 @@ msgstr ""
 "Her kan du velja tast eller tastekombinasjon for å byta mellom forskjellige "
 "tastaturoppsett."
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Åtvaring"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1480,257 +1462,227 @@ msgstr ""
 "Under installasjonen må du bruka høgre «Ctrl»-tast for\n"
 "å byta mellom tastaturoppsett."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun-mus"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Generell PS/2-hjulmus"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking-mus"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 knapp"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Generell 2-knappsmus"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Generell 3-knappsmus med hjulemulering"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Hjul"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seriell"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Generell 3-knappsmus"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan med hjulemulering"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC-serien"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC-serien med hjulemulering"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+ eller FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM-serien"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech-mus (gammal C7-seriemus)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech-mus (gammal C7-seriemus) med hjulemulering"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking-mus med hjulemulering"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "bussmus"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 knappar"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 knappar"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 knappar med hjulemulering"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universell"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Alle PS/2- eller USB-mus"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Tving evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox-mus"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware-mus"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ingen"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Inga mus"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Test musa"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Vel mustype"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Musval"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Vil du slå på emulering av tredje museknapp?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Musport"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Vel serieporten som musa er kopla til."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Knappemulering"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Knapp 2-emulering"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Knapp 3-emulering"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Test musa"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "For å setja musa i bruk,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "BRUK HJULET!"
@@ -1794,6 +1746,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Fransk"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polsk"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armensk (gammal)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokerisk (syllabisk)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun-mus"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox-mus"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware-mus"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Knappemulering"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Knapp 2-emulering"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Knapp 3-emulering"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Tyrkisk (tradisjonell F-modell)"
 
diff --git a/po/pa_IN.po b/po/pa_IN.po
index c1177f2..9e32d16 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2005-03-27 17:55+0530\n"
 "Last-Translator: Jaswinder Singh Phulewala <jaswinderphulewala@yahoo.com>\n"
 "Language-Team: Punjabi <punlinux-i18n@lists.soruceforge.net>\n"
@@ -62,22 +62,22 @@ msgstr "32 ਮੈਬਾ"
 msgid "64 MB or more"
 msgstr "64 ਮੈਬਾ ਜਾਂ ਵੱਧ"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X ਸਰਵਰ"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "X ਸਰਵਰ ਚੁਣੋ"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "ਬਹੁ-ਹੈੱਡ ਸੰਰਚਨਾ"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -86,12 +86,12 @@ msgstr ""
 "ਤੁਹਾਡਾ ਸਿਸਟਮ ਬਹੁ ਹੈੱਡ ਸੰਰਚਨਾ ਨੂੰ ਸਹਿਯੋਗ ਦਿੰਦਾ ਹੈ।\n"
 "ਤੁਸੀਂ ਕੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "ਆਪਣੇ ਗਰਾਫਿਕਸ ਕਾਰਡ ਦਾ ਮੈਮੋਰੀ ਅਕਾਰ ਚੁਣੋ"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -99,82 +99,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "ਸਾਰੇ ਹੈੱਡ ਨਿਰਭਰਤਾ ਤੋਂ ਬਿਨਾ ਸੰਰਚਿਤ ਕਰੋ"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama ਐਕਸਟੈਂਸ਼ਨ ਵਰਤੋ"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "ਸਿਰਫ ਕਾਰਡ \"%s\"%s ਹੀ ਸੰਰਚਿਤ ਕਰੋ"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "ਪਸੰਦ"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਸੰਰਚਨਾ"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "ਬਾਹਰ"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "ਗਰਾਫਿਕਸ ਕਾਰਡ"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "ਮਾਨੀਟਰ"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "ਰੈਜ਼ੋਲੇਸ਼ਨ"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "ਜਾਂਚ"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "ਚੋਣ"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "ਪਲੱਗਇਨ"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "ਤੁਹਾਡੀ Xorg ਸੰਰਚਨਾ ਫਾਇਲ ਖਰਾਬ ਹੈ, ਅਸੀਂ ਇਸ ਨੂੰ ਰੱਦ ਕਰਾਂਗੇ।"
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -187,32 +187,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "ਹੈੱਡ #%d ਲਈ ਮਾਨੀਟਰ ਚੁਣੋ"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "ਮਾਨੀਟਰ ਚੁਣੋ"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "ਲਾਓ ਤੇ ਚਲਾਓ"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "ਵਿਆਪਕ"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "ਵਿਕ੍ਰੇਤਾ"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -234,22 +234,22 @@ msgstr ""
 "ਨਾਲ ਮਾਨੀਟਰ ਕਿਸਮ ਨਹੀਂ ਚੁਣੀ ਹੈ: ਤੁਸੀਂ ਆਪਣਾ ਮਾਨੀਟਰ ਖਰਾਬ ਕਰ ਸਕਦੇ ਹੋ।\n"
 "ਜੇ ਕੋਈ ਸ਼ੱਕ ਹੈ, ਸੰਭਾਲ ਵਿਵਸਥਾ ਚੁਣੋ।"
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "ਖਤਿਜੀ ਮੁੜ-ਤਾਜ਼ਾ ਦਰ"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "ਲੰਬਕਾਰੀ ਮੁੜ-ਤਾਜ਼ਾ ਦਰ"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "ਕਾਰਵਾਈ ਚੁਣੋ"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -264,7 +264,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -277,83 +277,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 ਰੰਗ (8 ਬਿੱਟ)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 ਹਜ਼ਾਰ ਰੰਗ (15 ਬਿੱਟ)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 ਹਜ਼ਾਰ ਰੰਗ (16 ਬਿੱਟ)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 ਮਿਲੀਅਨ ਰੰਗ (24 ਬਿੱਟ)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "ਸਵੈ-ਚਾਲਿਤ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "ਰੈਜ਼ੋਲੇਸ਼ਨ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "ਹੋਰ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "ਰੈਜ਼ੋਲੂਸ਼ਨ ਅਤੇ ਰੰਗ ਡੂੰਘਾਈ ਚੁਣੋ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "ਗਰਾਫਿਕਸ ਕਾਰਡ: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "ਠੀਕ ਹੈ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "ਸਹਾਇਤਾ"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "ਸੰਰਚਨਾ ਦੀ ਜਾਂਚ"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "ਕੀ ਤੁਸੀਂ ਸੰਰਚਨਾ ਦੀ ਜਾਂਚ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "ਚੇਤਾਵਨੀ: ਇਸ ਗਰਾਫਿਕਸ ਕਾਰਡ ਦੀ ਜਾਂਚ ਤੁਹਾਡੇ ਕੰਪਿਊਟਰ ਨੂੰ ਰੋਕ ਸਕਦੀ ਹੈ"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -364,152 +364,157 @@ msgstr ""
 "%s\n"
 "ਕੁਝ ਪੈਰਾਮੀਟਰ ਤਬਦੀਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d ਸਕਿੰਟਾਂ ਵਿੱਚ ਖਤਮ ਹੋ ਰਿਹਾ ਹੈ"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "ਕੀ ਇਹ ਠੀਕ ਵਿਵਸਥਾ ਹੈ?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "yes"
 msgstr "ਹਾਂ"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "ਕੀਬੋਰਡ ਖਾਕਾ: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "ਕੀਬੋਰਡ ਖਾਕਾ: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "ਮਾਊਸ ਕਿਸਮ: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "ਮਾਨੀਟਰ: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "ਮਾਨੀਟਰ ਖਤਿਜੀ-ਸਮਾਕਾਲਤਾ: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "ਮਾਨੀਟਰ ਲੰਬਕਾਰੀ-ਮੁੜਤਾਜ਼ਾ: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "ਗਰਾਫਿਕਸ ਕਾਰਡ: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "ਗਰਾਫਿਕਸ ਮੈਮੋਰੀ: %s ਕਿਬਾ\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "ਰੰਗ ਡੂੰਘਾਈ: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "ਰੈਜ਼ੋਲੂਸ਼ਨ: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg ਡਰਾਈਵਰ: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg ਸੰਰਚਨਾ"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, fuzzy, c-format
 msgid "Global options"
 msgstr "ਮੈਡਿਊਲ ਚੋਣ:"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "ਗਰਾਫਿਕਸ ਕਾਰਡ: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "ਸ਼ੁਰੂਆਤੀ ਤੇ ਗਰਾਫੀਕਲ ਇੰਟਰਫੇਸ"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
@@ -517,7 +522,7 @@ msgstr ""
 "ਹੈ।\n"
 "ਕੀ ਤੁਸੀਂ ਮੁੜ ਚਲਾਉਣ ਸਮੇਂ Xorg ਸ਼ੁਰੂ ਕਰਨਾ ਪਸੰਦ ਕਰਦੇ ਹੋ?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -537,922 +542,899 @@ msgstr ""
 "\n"
 "ਕੀ ਤੁਹਾਡੇ ਕੋਲ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਹੈ?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "ਤੁਹਾਡਾ TV ਕਿਹੜਾ norm ਵਰਤ ਰਿਹਾ ਹੈ?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "ਚੈੱਕ (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "ਜਰਮਨ"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "ਡਵੋਰਕ"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "ਸਪੇਨੀ"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "ਫੈਨਿਸ਼"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "ਫਰੈਂਚ"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK ਕੀਬੋਰਡ"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "ਨਾਰਵੇਜੀਅਨ"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "ਪੋਲੈਂਡੀ"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "ਰੂਸੀ"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "ਸਵੈਡਿਸ਼"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US ਕੀਬੋਰਡ"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "ਅਲਬੇਨੀਅਨ"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "ਅਮਰੀਕੀ (ਪੁਰਾਣਾ)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "ਅਮਰੀਕਨ (ਟਾਈਪਰਾਈਟਰ)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "ਅਮਰੀਕਨ (ਬੋਲੀ ਮੁਤਾਬਕ)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "ਅਰਬੀ"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "ਇਸਟੋਨੀਅਨ"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "ਅਜ਼ਰਬਾਈਜਾਨੀ (ਲੈਟਿਨ)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "ਬੈਲਜੀਅਨ"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "ਬੰਗਾਲੀ (ਇੰਸਕ੍ਰਿਪਟ)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "ਬੰਗਾਲੀ (ਪਰਭਾਤ)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "ਬੁਲਗਾਰੀਅਨ (ਬੋਲੀ ਮਤਾਬਕ)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "ਬੁਲਗਾਰੀਅਨ (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "ਬਰਜ਼ੀਲੀ (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "ਬੋਸਨੀਅਨ"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "ਡਜ਼ੋਂਖਾ/ਤਿੱਬਤੀ"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "ਬੇਲਾਰੂਸੀ"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "ਸਵਿਸ (ਜਰਮਨ ਖਾਕਾ)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "ਸਵਿਸ (ਫਰੈਂਚ ਖਾਕਾ)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "ਚੇਰੂਕੀ ਸਿਲੇਬਿਕਸ"
+"Czech (QWERTZ)"
+msgstr "ਚੈੱਕ (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "ਚੈੱਕ (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "ਜਰਮਨ"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "ਜਰਮਨ (ਬਿਨਾ ਡੈੱਡ ਸਵਿੱਚ)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "ਦੇਵਨਾਗਰੀ"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "ਡੈਨਿਸ਼"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "ਡਵਿਰਕ (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "ਡਵੋਰਕ (ਇਸਪੇਰਾਂਟੋ)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "ਡਵੋਰਕ (ਫਰੈਂਚ)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "ਡਵੋਰਕ (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "ਡਵੋਰਕ (ਨਾਰਵੇਜੀਅਨ)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "ਡਵੋਰਕ (ਪੌਲਿਸ਼)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "ਡਵੋਰਕ (ਸਵੈਡਿਸ਼)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "ਇਸਟੋਨੀਅਨ"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "ਸਪੇਨੀ"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "ਫੈਨਿਸ਼"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "ਫੈਰੋਈਜ਼"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "ਫਰੈਂਚ"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "ਫਰੈਂਚ"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "ਗਰੀਕ (ਪੌਲੀਟੋਨਿਕ)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "ਗਰੀਕ (ਪੌਲੀਟੋਨਿਕ)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK ਕੀਬੋਰਡ"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "ਜੀਓਰਜੀਅਨ (\"ਰੂਸੀ\" ਖਾਕਾ)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "ਜੀਓਰਜੀਅਨ (\"ਲੈਟਿਨ\" ਖਾਕਾ)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "ਗਰੀਕ"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "ਗਰੀਕ (ਪੌਲੀਟੋਨਿਕ)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "ਗੁਜਰਾਤੀ"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "ਗੁਰਮੁਖੀ"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "ਕਰੋਆਟੀਅਨ"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "ਹੁੰਗਾਰੀਅਨ"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "ਇਰਿਸ਼"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "ਇਨੁਕਟੀਟੁਟ"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "ਇਸਰਾਈਲੀ"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "ਇਸਰਾਈਲੀ (ਬੋਲੀ-ਅਧਾਰਿਤ)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "ਇਰਾਨੀ"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "ਟਾਪੂਿਕ"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "ਇਟਲੀਅਨ"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "ਜਪਾਨੀ 106 ਕੁੰਜੀਆਂ"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "ਕਾਨਾਡਾ"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "ਕਾਈਰਗਈਜ਼"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "ਕੋਰੀਅਨ"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "ਕੁਰਡਿਸ਼ (ਅਰਬਿਕ ਸਕਰਿਪਟ)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "ਲੈਟਿਨ ਅਮਰੀਕਨ"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "ਲਾਓਟੀਅਨ"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "ਇਰਾਨੀ"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "ਲਾਟਵਿਨ"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "ਮਲਿਆਲਮ"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "ਮੈਕੇਡੋਨੀਅਨ"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "ਮਯਾਨਮਾਰ (ਬਰਮੀਸ)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "ਮੰਗੋਲੀਅਨ (ਸਿਰਿੱਲਿਕ)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "ਮਲਟੀਸ (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "ਮਲਟੀਸ (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "ਡੱਚ"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "ਨਾਰਵੇਜੀਅਨ"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "ਉੜੀਆ"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "ਪੌਲਿਸ਼ (ਕਵੈਰਟੀ ਖਾਕਾ)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "ਪੌਲਿਸ਼ (ਕਵੈਰਟਜ਼ ਖਾਕਾ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "ਪਾਸ਼ਟੋ"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "ਪੋਰਤੂਗੈਈਸ"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "ਕੈਨੇਡੀਅਨ (ਕੂਈਬੇਕ)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "ਰੋਮਾਨੀਅਨ (ਕਵੈਰਟਜ਼)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "ਰੋਮਾਨੀਅਨ (ਕਵੇਰਟੀ)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "ਰੋਮਾਨੀਅਨ (ਕਵੈਰਟਜ਼)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "ਰੂਸੀ"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "ਰੂਸੀ (ਬੋਲੀ-ਅਧਾਰਿਤ)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "ਸਵੈਡਿਸ਼"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "ਸਲੋਵੇਨੀਅਨ"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "ਸਲੋਵਾਕੀਅਨ (ਕਵੇਰਟਜ਼)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "ਸਲੋਵਾਕੀਅਨ (ਕਵੇਰਟੀ)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "ਸਾਮੀ (ਨਾਰਵੇਜੀਅਨ)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "ਸਾਮੀ (ਸਵੈਡਿਸ਼/ਫਿਨਿਸ਼)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "ਸਿੰਧੀ"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "ਸਰਬੀਅਨ (ਸਿਰਿੱਲਿਕ)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "ਸਾਇਰਿਆਕ"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "ਸਾਇਰਿਆਕ (ਬੋਲੀ-ਅਧਾਰਿਤ)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "ਤੇਲਗੂ"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "ਤਾਮਿਲ (ISCII-ਖਾਕਾ)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "ਤਾਮਿਲ (ਟਾਈਪ-ਰਾਈਟਰ-ਖਾਕਾ)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "ਥਾਈ (ਕੇਡਮਾਨੀ)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "ਥਾਈ ((TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "ਥਾਈ (ਪਾਟਾਚੋਟੇ)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "ਟਾਜਿਕ"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "ਤੁਰਕਮੇਨ"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "ਤੁਰਕਿਸ਼ (ਨਵਾਂ \"Q\" ਮਾਡਲ)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "ਤੁਰਕਿਸ਼ (ਨਵਾਂ \"Q\" ਮਾਡਲ)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "ਯੁਕਰੇਨੀਅਨ"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "ਉਰਦੂ ਕੀਬੋਰਡ"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US ਕੀਬੋਰਡ"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US ਕੀਬੋਰਡ ( ਅੰਤਰਰਾਸ਼ਟਰੀ)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US ਕੀਬੋਰਡ ( ਅੰਤਰਰਾਸ਼ਟਰੀ)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "ਉਜ਼ਬੇਕ (ਸਿਰਿੱਲਿਕ)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "ਵੀਅਤਨਾਮੀ \"ਅੰਕੀ ਕਤਾਰ\" ਕਵੇਰਟੀ"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "ਯੂਗੋਸਲਾਵੀਅਨ (ਲੈਟਿਨ)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "ਸੱਜੀ Alt ਸਵਿੱਚ"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "ਦੋਨੋ Shift ਸਵਿੱਚਾਂ ਇੱਕੋ-ਸਮੇਂ"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control ਅਤੇ Shift ਸਵਿੱਚਾਂ ਇੱਕੋ-ਸਮੇਂ"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock ਸਵਿੱਚ"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift ਅਤੇ CapsLock ਸਵਿੱਚਾਂ ਇੱਕੋ-ਸਮੇਂ"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl ਅਤੇ Alt ਸਵਿੱਚਾਂ ਇਕੋ-ਸਮੇਂ"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt ਅਤੇ Shift ਸਵਿੱਚਾਂ ਇੱਕੋ-ਸਮੇਂ"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"ਮੇਨੂ\" ਸਵਿੱਚ"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "ਖੱਬੀ \"Windows\" ਸਵਿੱਚ"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "ਸੱਜੀ \"Windows\" ਸਵਿੱਚ"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "ਦੋਨੋ Control ਸਵਿੱਚਾਂ ਇਕੋ-ਸਮੇਂ"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "ਦੋਨੋ Alt ਸਵਿੱਚਾਂ ਇਕੋ-ਸਮੇਂ"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "ਖੱਬੀ Shift ਸਵਿੱਚ"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "ਸੱਜੀ Shift ਸਵਿੱਚ"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "ਖੱਬੀ Alt ਸਵਿੱਚ"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "ਖੱਬੀ Control ਸਵਿੱਚ"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "ਸੱਜੀ Control ਸਵਿੱਚ"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1463,12 +1445,12 @@ msgstr ""
 "ਕੀਬੋਰਡ ਵਿੱਚ ਤਬਦੀਲ ਹੋਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿੰਦੇ ਹਨ\n"
 "(ਉਦਾਹਰਨ: ਲੈਟਿਨ ਅਤੇ ਨਾਨ ਲੈਟਿਨ)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1479,257 +1461,227 @@ msgstr ""
 "ਦੌਰਾਨ, ਤੁਹਾਨੂੰ ਵੱਖ-ਵੱਖ ਕੀਬੋਰਡ ਖਾਕਿਆਂ ਵਿੱਚ ਤਬਦੀਲੀ ਲਈ ਸੱਜੀ\n"
 "ਕੰਟਰੋਲ ਸਵਿੱਚ ਵਰਤਣ ਦੀ ਲੋੜ ਪਵੇਗੀ।"
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "ਸੰਨ - ਮਾਊਸ"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "ਮਿਆਰੀ"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "ਲੌਜੀਟਿਕ ਮਾਊਸਮੈਨ+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "ਸਧਾਰਨ PS2 ਪਹੀਆ ਮਾਊਸ"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "ਗਲਾਈਡ-ਬਿੰਦੂ"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "ਕੇਨਸਿੰਗਟੋਨ ਥਿੰਕਿੰਗ ਮਾਊਸ"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "ਸਧਾਰਨ ਨੈੱਟ-ਮਾਊਸ"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "ਸਧਾਰਨ ਨੈੱਟ-ਸਕਰਾਲ"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "ਮਾਈਕ੍ਰੋਸਾਫਟ ਝਲਕਾਰਾ"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 ਬਟਨ"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "ਸਧਾਰਨ 2 ਬਟਨ ਮਾਊਸ"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "ਪਹਿਆ ਸਮਰੂਪ ਨਾਲ ਸਧਾਰਨ 3 ਬਟਨ ਮਾਊਸ"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "ਚੱਕਰ"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "ਸੀਰੀਅਲ"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "ਸਧਾਰਨ 3 ਬਟਨ ਮਾਊਸ"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "ਮਾਈਕ੍ਰੋਸਾਫਟ ਇੰਟੈਲੀ-ਮਾਊਸ"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "ਲੌਜਿਟਿਕ ਮਾਊਸ-ਮੈਨ"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "ਪਹੀਆ ਸਮਰੂਪ ਨਾਲ ਲੌਜਿਟਿਕ ਮਾਊਸ-ਮੈਨ"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "ਮਾਊਸ ਸਿਸਟਮ"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "ਲੌਜੀਟਿਕ CC ਲੜੀ"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "ਪਹੀਆ ਸਮਰੂਪ ਨਾਲ ਲੌਜੀਟਿਕ CC ਲੜੀ"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "ਲੌਜੀਟਿਕ ਮਾਊਸਮੈਨ+/ਪਹਿਲਾਮਾਊਸ+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM ਲੜੀ"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM ਹਿੱਟਟੈਬਲਿਟ"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "ਲੌਜੀਟਿਕ ਮਾਊਸ (ਸੀਰੀਅਲ, ਪੁਰਾਣਾ C7 ਕਿਸਮ)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "ਪਹੀਆ ਸਮਰੂਪ ਨਾਲ ਲੌਜੀਟਿਕ ਮਾਊਸ (ਸੀਰੀਅਲ, ਪੁਰਾਣਾ C7 ਕਿਸਮ)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "ਪਹੀਆ ਸਮਰੂਪ ਨਾਲ ਕੇਨਸਿੰਗਟੋਨ ਥਿੰਕਿੰਗ ਮਾਊਸ"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "ਬਸਮਾਊਸ"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 ਬਟਨ"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 ਬਟਨ"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "ਪਹੀਆ ਸਮਰੂਪ ਨਾਲ 3 ਬਟਨ"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "ਸਰਬ-ਵਿਆਪਕ"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "ਕੋਈ PS/2 ਤੇ USB ਮਾਊਸ"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "ਮਾਈਕ੍ਰੋਸਾਫਟ ਝਲਕਾਰਾ"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "ਵੱਖਰੇ"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ਕੋਈ ਨਹੀਂ"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "ਕੋਈ ਮਾਊਸ ਨਹੀਂ"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੀ ਮਾਊਸ ਕਿਸਮ ਚੁਣੋ।"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "ਦਸਤੀ ਜੰਤਰ"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "ਤੀਜਾ ਬਟਨ ਸਮਰੂਪ?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "ਮਾਊਸ ਪੋਰਟ"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਮਾਊਸ ਜੋੜਨ ਲਈ ਸੀਰੀਅਲ ਪੋਰਟ ਚੁਣੋ।"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "ਬਟਨ ਸਮਰੂਪਤਾ"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "ਬਟਨ 2 ਸਮਰੂਪਤਾ"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "ਬਟਨ 3 ਸਮਰੂਪਤਾ"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਮਾਊਸ ਜਾਂਚ ਕਰੋ"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "ਮਾਊਸ ਸਰਗਰਮ ਕਰਨ ਲਈ,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ਆਪਣਾ ਪਹੀਆ ਹਿਲਾਓ!"
@@ -1793,6 +1745,52 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "ਡਵੋਰਕ"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "ਫਰੈਂਚ"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "ਪੋਲੈਂਡੀ"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "ਅਮਰੀਕੀ (ਪੁਰਾਣਾ)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "ਚੇਰੂਕੀ ਸਿਲੇਬਿਕਸ"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "ਸਿੰਧੀ"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "ਸੰਨ - ਮਾਊਸ"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "ਵੱਖਰੇ"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "ਬਟਨ ਸਮਰੂਪਤਾ"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "ਬਟਨ 2 ਸਮਰੂਪਤਾ"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "ਬਟਨ 3 ਸਮਰੂਪਤਾ"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "ਤੁਰਕਿਸ਼ (ਪੁਰਾਣਾ \"F\" ਮਾਡਲ)"
 
diff --git a/po/pl.po b/po/pl.po
index 4a6cf65..85293b5 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2015-05-13 23:21+0000\n"
 "Last-Translator: Daniel Napora <napcok@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/mageia/language/"
@@ -76,22 +76,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB lub więcej"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X serwer"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Wybierz serwer X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Konfiguracja wielomonitorowa"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -100,12 +100,12 @@ msgstr ""
 "Twój system obsługuje wiele monitorów.\n"
 "Co chcesz zrobić?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Określ rozmiar pamięci karty graficznej"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -116,7 +116,7 @@ msgstr ""
 "obsługuje więcej funkcji.\n"
 "Czy chcesz go użyć?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -125,75 +125,75 @@ msgstr ""
 "Sterownik własnościowy nie został prawidłowo zainstalowany. Przywracanie "
 "sterownika otwartego."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Konfiguruj wszystkie monitory niezależnie"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Użyj rozszerzenia Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Konfiguruj tylko kartę \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Własne"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Konfiguracja karty graficznej i monitora"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Zakończ"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Karta graficzna"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Rozdzielczość"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opcje"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Plik konfiguracyjny Xorg jest uszkodzony i zostanie zignorowany."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -206,32 +206,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Wybierz monitor dla #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Wybierz monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Standardowa"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Dostawca"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -255,22 +255,22 @@ msgstr ""
 "może to spowodować uszkodzenie monitora.\n"
 "Jeśli masz wątpliwości, wybierz zachowawcze ustawienia."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Częstotliwość synchronizacji poziomej"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Częstotliwość synchronizacji pionowej"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Wybierz wtyczki"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -295,7 +295,7 @@ msgstr ""
 "graficzny za pomocą \"Konfiguracja serwera graficznego\"  Centrum Sterowania "
 "Mageia\" poprzez ponowne wybranie swojej karty graficznej."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -316,83 +316,83 @@ msgstr ""
 "'nonfree' w sekcji \"Instalacja i usuwanie oprogramowania\" i zainstaluj "
 "pakiet z firmware ręcznie lub skonfiguruj ponownie swoją kartę graficzną."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 kolorów (8 bitów)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tys. kolorów (15 bitów)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tys. kolorów (16 bitów)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 mln. kolorów (24 bity)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Rozdzielczości"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Inne"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Określ rozdzielczość oraz głębię kolorów"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Karta graficzna: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Test konfiguracji"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Czy chcesz przetestować tą konfigurację?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Uwaga: testowanie tej karty graficznej może zawiesić komputer"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -403,159 +403,164 @@ msgstr ""
 "%s\n"
 "Spróbuj zmienić niektóre parametry"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Opuszczanie w ciągu %d sekund(y)"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Czy to ustawienie jest prawidłowe ?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Wyłącz Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "nie"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "tak"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Sprzętowa akceleracja 3D: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Układ klawiatury: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Układ klawiatury: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Typ myszy: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Synchronizacja pozioma monitora: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Synchronizacja pionowa monitora: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Karta graficzna: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Pamięć karty: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Głębia kolorów: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rozdzielczość: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Sterownik Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Konfiguracja Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Ogólne opcje"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Wyłącz Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opcje karty graficznej"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Aktywuj przeźroczystość (rozszerzenie zespolone)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Użyj sprzętowej akceleracji wskaźnika myszy"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Aktywuj akcelerację renderingu (może spowodować wyświetlanie informacji o "
 "błędzie)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Aktywuj wyświetlanie na zewnętrzny monitorze"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Aktywuj wyświetlanie na drugim monitorze"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Wymuś tryb wyświetlania DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Aktywuj przełączanie monitorów skrótem klawiszowym w BIOS"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Użyj EXA zamiast XAA (lepsza wydajność renderowania i zespalania)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Interfejs graficzny przy uruchamianiu"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Automatycznie  uruchom interfejs graficzny przy starcie sytemu (Xorg)"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -576,922 +581,899 @@ msgstr ""
 "\n"
 "Czy chcesz posiadać tą funkcję?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "W jakim systemie pracuje Twój telewizor?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "inne"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "czeski (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "niemiecki"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvoraka"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "hiszpański"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "fiński"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "francuski"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "angielski"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "norweski"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "polski"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "rosyjski"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "szwedzki"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "amerykański"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "albański"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "armeński (stary)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "armeński - fonetyczny"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "armeński - fonetyczny"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "arabski"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr ""
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "azerski (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "belgijski"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "bengalski (układ Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "bengalski (układ Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "bułgarski - fonetyczny"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "bułgarski (BSD)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "brazylijski (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "bośniacki"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/tybetański"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "białoruski"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "szwajcarski (układ niemiecki)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "szwajcarski (układ francuski)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee sylabiczny"
+"Czech (QWERTZ)"
+msgstr "czeski (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "czeski (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "niemiecki"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "niemiecki (bez martwych klawiszy)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "devenagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "duński"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvoraka (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvoraka (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvoraka (francuski)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvoraka (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvoraka (norweski)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvoraka (polski)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvoraka (szwedzki)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "estoński"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "hiszpański"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "fiński"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faroese"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "francuski"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "francuski"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "grecki (politoniczny)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "grecki (politoniczny)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "angielski"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "gruziński (układ rosyjski)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "gruziński (układ łaciński)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "grecki"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "grecki (politoniczny)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "chorwacki"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "węgierski"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irlandzki"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "inkuktit"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "izraelski"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "izraelski (fonetyczny)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "irański"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "islandzki"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "włoski"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "japoński 106 klawiszy"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "kirgizki"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "koreański"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "kurdyjski (arabski sktypt)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "latyno-amerykański"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "laotański"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "litewski"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "łotewski"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "malajski"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "maoryski"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "macedoński"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "myanmar (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "mongolski (cyrylica)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "maltański (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "maltański (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "nigeryjski"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "holenderski"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "norweski"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "polski (programisty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "polski (maszynistki)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "portugalski"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "kanadyjski (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "rumuński (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "rumuński (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "rumuński (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "rosyjski"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "rosyjski (fonetyczny)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "szwedzki"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "słoweński"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "słowacki (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "słowacki (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norweski)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (szwedzki/fiński)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "serbski (cyrylica)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syria"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "syryjski (fonetyczny)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "tamilski (ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "tamilski (maszynistki)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "tajski (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "tajski (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "tajski (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (układ marokijski) (+łaciński/arabski)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonetyczny) (+łaciński/arabski)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "tadżycki"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "turkmeński"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "ukraiński"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "klawiatura Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "amerykański"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "amerykański (międzynarodowy)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "amerykański (międzynarodowy)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (klawiatura US z 3 poziomami na klucz)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "uzbecki (cyrylica)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "wietnamski QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "jugosłowiański (łaciński)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Prawy klawisz ALT"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Równocześnie oba klawisze SHIFT"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Równocześnie klawisze Control i Shift"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Klawisz Capslock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Równocześnie klawisze Shift i Capslock"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Równocześnie klawisze Ctrl i Alt"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Równocześnie klawisze Alt i Shift"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Klawisz \"Menu\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Lewy klawisz \"Windows\""
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Prawy klawisz \"Windows\""
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Równocześnie oba klawisze Control"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Równocześnie oba klawisze ALT"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Lewy klawisz Shift"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Prawy klawisz Shift"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Lewy klawisz ALT"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Lewy klawisz Control"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Prawy klawisz Control"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1502,12 +1484,12 @@ msgstr ""
 "umożliwiających przełączanie pomiędzy różnymi układami\n"
 "klawiatur (np: latin na non-latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1519,257 +1501,227 @@ msgstr ""
 "z prawego klawisza Control w celu przełączania się pomiędzy\n"
 "różnymi układami klawiatur."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Mysz Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standardowy"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Mysz standardowa PS/2 z kółkiem"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1-przyciskowa"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Mysz standardowa 2-przyciskowa"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Mysz standardowa 3-przyciskowa z emulacją kółka"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Mysz z kółkiem"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "szeregowa"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Mysz standardowa 3-przyciskowa"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan z emulacją kółka"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech seria CC"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech seria CC z emulacją kółka"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "Seria MM"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet (szeregowy)"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Mysz Logitech (szeregowa, stary typ C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Mysz Logitech (szeregowa, stary typ C7) z emulacją kółka"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse z emulacją kółka"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2-przyciskowa"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3-przyciskowa"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 przyciski z emulacją kółka"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Uniwersalny"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Dowolna mysz PS/2 i USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Wymuś zastosowanie evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Kontroler S Microsoft Xbox"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Mysz w VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Mysz VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "brak"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Brak myszy"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Testowanie myszy"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Wybierz rodzaj myszy."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Wybór myszy"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emulować środkowy przycisk?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Port myszy"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Wybierz port szeregowy, do którego jest podłączona mysz."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulacja przycisków"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "2 przyciski z emulacją"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3 przyciski z emulacją"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Przetestuj mysz"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "By uaktywnić mysz,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "RUSZ KÓŁKIEM!"
@@ -1828,3 +1780,51 @@ msgstr "Konfiguracja Grafiki Mageia"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "Konfiguracja Grafiki Mageia - wymagane jest uwierzytelnianie"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvoraka"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "francuski"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "polski"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "armeński (stary)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee sylabiczny"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Mysz Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Mysz w VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Mysz VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulacja przycisków"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "2 przyciski z emulacją"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3 przyciski z emulacją"
diff --git a/po/pt.po b/po/pt.po
index 7ba1b2f..7730a04 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2018-12-05 13:06+0000\n"
 "Last-Translator: Rui <xymarior@yandex.com>\n"
 "Language-Team: Portuguese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -65,22 +65,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB ou mais"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Servidor X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Escolha um servidor X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configuração multi-cabeças"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -89,12 +89,12 @@ msgstr ""
 "O seu sistema suporta uma configuração para múltiplas cabeças.\n"
 "O que deseja fazer?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Seleccione o tamanho da memória da sua placa gráfica"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -105,7 +105,7 @@ msgstr ""
 "pode suportar funcionalidades adicionais.\n"
 "Deseja usar este controlador proprietário?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -114,75 +114,75 @@ msgstr ""
 "O controlador proprietário não foi devidamente instalado, a mudar para o "
 "controlador livre predefinido."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configurar todas as cabeças independentemente"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Usar extensão Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configurar apenas a placa \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Placa Gráfica e Configuração do Monitor"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Sair"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Placa Gráfica"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Resolução"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Teste"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opções"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "'Plugins'"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "O seu ficheiro de configuração Xorg está danificado, será ignorado."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -195,32 +195,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Escolha um monitor para a cabeça #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Escolha um monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "'Plug'n Play'"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Genérico"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Fabricante"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -244,22 +244,22 @@ msgstr ""
 "seu monitor.\n"
 "Em caso de dúvida, escolha uma definição conservadora."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Taxa de refrescamento horizontal"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Taxa de refrescamento vertical"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Escolher 'plugins'"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -284,7 +284,7 @@ msgstr ""
 "gráfico indo a \"Configurar servidor gráfico\" no Centro de Controlo Mageia "
 "e seleccione novamente a sua placa gráfica."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -305,83 +305,83 @@ msgstr ""
 "repositório 'nonfree' no 'Gestor de Pacotes' e instale manualmente o pacote "
 "de 'firmware' ou reconfigure a sua placa gráfica."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 cores (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil cores (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil cores (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milhões de cores (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Resoluções"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Mais"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Escolha a resolução e a profundidade da cor"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Placa gráfica: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Teste da configuração"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Deseja testar a configuração?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Aviso: ao testar esta placa gráfica pode bloquear o seu computador"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -392,157 +392,162 @@ msgstr ""
 "%s\n"
 "Tente mudar alguns parâmetros"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "A sair em %d segundos"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Esta é a configuração correcta?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Desactivar Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "não"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "sim"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Aceleração de material 3D: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Disposição do teclado: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Disposição do teclado: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipo de rato: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Actualização Horizontal do Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Actualização Vertical do Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Placa gráfica: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memória gráfica: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Profundidade da cor: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolução: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Controlador Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Configuração Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Opções globais"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Desactivar Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opções da placa gráfica"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Activar Translucência (extensão compósita)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Usar apontador de rato com aceleração de material"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Activar Aceleração RENDER (isto pode causar erros ao mostrar texto)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Activar exibição duplicada no monitor externo"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Activar exibição duplicada no segundo monitor"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Forçar modo de exibição do DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Activar tecla de atalho da BIOS para mudança de monitor externo"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Usar EXA em vez de XAA (melhor desempenho para Apresentar e Compósita)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Interface gráfico no arranque"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Iniciar automaticamente o interface gráfico (Xorg) após arrancar"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -563,134 +568,47 @@ msgstr ""
 "\n"
 "Tem esta funcionalidade?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Que norma usa a sua TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "mais"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Checo (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Alemão"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Espanhol"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finlandês"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francês"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Teclado Inglês"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norueguês"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polaco"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Russo"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Sueco"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Teclado Americano"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanês"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Arménio (antigo)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Arménio (máquina de escrever)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Arménio (fonético)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arábico"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -699,189 +617,219 @@ msgstr ""
 "_: teclado\n"
 "Asturiano"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaijanês (latim)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belga"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalês (disposição Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalês (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Búlgaro (fonético)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Búlgaro (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasileiro (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bósnio"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetano"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Bielorusso"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Suíço (disposição Alemã)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Suíço (disposição Francêsa)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee silábico"
+"Czech (QWERTZ)"
+msgstr "Checo (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Checo (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Alemão"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Alemão (sem teclas mortas)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dinamarquês"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Francês)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norueguês)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polaco)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Sueco)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estónio"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Espanhol"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finlandês"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faroese"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr ""
+"_: teclado\n"
+"Francês (Bépo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -890,303 +838,324 @@ msgstr ""
 "_: teclado\n"
 "Francês (Bépo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr ""
 "_: teclado\n"
 "Francês (Bépo, apenas latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr ""
+"_: teclado\n"
+"Francês (Bépo, apenas latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Teclado Inglês"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgiano (disposição \"Russa\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgiano (disposição \"Latina\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grego"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grego (politónico)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croata"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Húngaro"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irlandês"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelita"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelita (fonético)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iraniano"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandês"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italiano"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japonês 106 teclas"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kyrgyz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Coreano"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Curdo (script arábico)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Americano Latino"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotiano"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Lituano"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Letão"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedónio"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Birmanês)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongol (cirílico)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltês (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltês (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeriano"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Holandês"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norueguês"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polaco (disposição qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polaco (disposição qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Português"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canadiano (Quebeco)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romeno (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romeno (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1195,154 +1164,161 @@ msgstr ""
 "_: teclado\n"
 "Romeno (básico)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Russo"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Russo (fonético)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Sueco"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Esloveno"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Eslovaco (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Eslovaco (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norueguês)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (sueco/finlandês)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Sérvio (cirílico)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Siríaco"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Siríaco (fonético)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (disposição ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (disposição de máquina de escrever)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tailandês (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tailandês (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tailandês (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (disposição marroquina) (+latim/arábico)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonético) (+latim/arábico)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajique"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmen"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1351,7 +1327,7 @@ msgstr ""
 "_: teclado\n"
 "Turco (modelo \"F\")"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1360,137 +1336,147 @@ msgstr ""
 "_: teclado\n"
 "Turco (modelo \"Q\")"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ucraniano"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Teclado Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Teclado Americano"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Teclado Americano (Internacional)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Teclado Americano (Internacional)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (teclado US com 3 níveis por tecla)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Usbequistão (cirílico)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamita \"linha numérica\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslavo (latim)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Tecla Alt Direita"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Ambas as teclas Shift simultaneamente"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Teclas Control e Shift simultaneamente"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Tecla CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Teclas Shift e CapsLock simultaneamente"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Teclas Ctrl e Alt simultaneamente"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Teclas Alt e Shift simultaneamente"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Tecla \"Menu\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Tecla \"Windows\" esquerda"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Tecla \"Windows\" direita"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Ambas as teclas Control simultaneamente"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Ambas as teclas Alt simultaneamente"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Tecla Shift esquerda"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Tecla Shift Direita"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Tecla Alt Esquerda"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Tecla Control Esquerda"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Tecla Control Direita"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1501,12 +1487,12 @@ msgstr ""
 "irão permitir mudar entre as diferentes disposições do teclado\n"
 "(ex: latim e não latim)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1517,257 +1503,227 @@ msgstr ""
 "Durante a instalação, terá de usar a tecla de Controlo Direita\n"
 "para mudar a disposição do teclado."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Rato - Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Padrão"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Rato de Roda PS2 Genérico"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Rato Thinking da Kensington"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "NetMouse da Genius"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "NetScroll da Genius"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 botão"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Rato de 2 Botões Genérico"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Rato de 3 Botões Genérico com emulação de Roda"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Roda"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "série"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Rato de 3 Botões Genérico"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "IntelliMouse da Microsoft"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "MouseMan da Logitech"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "MouseMan com emulação de Roda da Logitech"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Sistemas de Rato"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Séries CC da Logitech"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Séries CC com emulação de Roda da Logitech"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "MouseMan+/FirstMouse+ da Logitech"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "Séries MM"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "HitTablet MM"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Rato Logitech (série, tipo C7 antigo)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Rato Logitech (série, tipo C7 antigo) com emulação de Roda"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Rato Thinking com emulação de Roda da Kensington"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "Rato Bus"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 botões"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 botões"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 botões com emulação da Roda"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Qualquer rato PS/2 e USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Forçar evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Controlador Xbox S da Microsoft"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Rato VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Rato VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "nenhum"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Nenhum Rato"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "A testar o rato"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Por favor seleccione o seu tipo de rato."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Seleccionar rato"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emular o terceiro botão?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Porta do Rato"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Por favor escolha em que porta série o seu rato está ligado."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulação de botões"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulação do 2º botão"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulação do 3º botão"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Por favor teste o rato"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Para activar o rato,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MOVA A SUA RODA!"
@@ -1829,3 +1785,51 @@ msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 "É necessária a autenticação para executar a Configuração dos Gráficos do "
 "Mageia"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francês"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polaco"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Arménio (antigo)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee silábico"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Rato - Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Rato VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Rato VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulação de botões"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulação do 2º botão"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulação do 3º botão"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index dbd0aa7..973d4b0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-07-07 23:25+0000\n"
 "Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/MageiaLinux/"
@@ -73,22 +73,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB ou mais"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Servidor X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Escolha um servidor X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configuração multiterminal"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -97,12 +97,12 @@ msgstr ""
 "Seu sistema suporta configuração de vários terminais.\n"
 "O que você quer fazer?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Selecione o tamanho da memória de sua placa de vídeo"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -113,7 +113,7 @@ msgstr ""
 "a recursos adicionais.\n"
 "Deseja instalar ele?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -122,77 +122,77 @@ msgstr ""
 "O driver proprietário não foi devidamente instalado, usando o driver livre "
 "por padrão."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configurar todos os terminais independentemente"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Usar extensão Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configurar apenas placa \"%s\" %s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personalizar"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Configuração da Placa de Vídeo e Monitor"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Sair"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Placa de vídeo"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Resolução"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Testar"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opções"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Plug-ins"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 "O seu arquivo de configuração do Xorg está com problemas, e portanto será\n"
 "ignorado."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -205,32 +205,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Escolha um monitor para o terminal #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Escolha um monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Genérico"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Fabricante"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -256,22 +256,22 @@ msgstr ""
 "monitor. \n"
 " Se estiver com dúvidas, escolha as características mais conservadoras."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Taxa de atualização horizontal"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Taxa de atualização vertical"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Escolher plugins"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -295,7 +295,7 @@ msgstr ""
 "gráficos, indo para \"conjunto de servidor gráfico\" no centro de controle "
 "Mageia e vá a sua placa gráfica. "
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -316,83 +316,83 @@ msgstr ""
 "repositório 'não-livre' em \"Instalar e remover software\" e instale o "
 "pacote de firmware manualmente ou reconfigurar sua placa gráfica."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 cores (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mil cores (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mil cores (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milhões de cores (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Resoluções"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Outra"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Escolha a resolução e a profundidade de cores"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Placa de vídeo: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Testar a configuração"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Você quer testar a configuração?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Atenção: testar esta placa de vídeo pode travar o seu computador"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -403,160 +403,165 @@ msgstr ""
 "%s\n"
 "Tente mudar alguns parâmetros"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Saindo em %d segundos"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Esta é a configuração correta?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Desabilitar Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "não"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "sim"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Hardware de aceleração 3D: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Layout do teclado: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Layout do teclado: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipo do mouse: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Sincronização Horizontal do Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Atualização Vertical do Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Placa de vídeo: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memória de vídeo: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Profundidade de cores: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolução: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Driver do Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Configuração do Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Opções globais"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Desabilitar Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opções da placa de vídeo"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Habilitar Transparência (Extensão do Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Usar cursor do mouse acelerado por hardware"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Habilitar Renderização Acelerada ( isso pode gerar problemas ao mostrar "
 "texto )"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Habilitar display duplicado no monitor externo"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Habilitar display duplicado no segundo display"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Forçar modo de display DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Habilitar hotkeys da BIOS para troca externa de monitor"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 "Utilizar EXA em vez de XAA (melhor performance para Render e Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Interface gráfica ao iniciar"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Iniciar automaticamente a interface gráfica (Xorg) durante o boot"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -577,119 +582,19 @@ msgstr ""
 "\n"
 "Você possui este recurso?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Qual é a norma que sua TV está utilizando?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "outro"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr ""
-"_: teclado\n"
-"Tcheco (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr ""
-"_: teclado\n"
-"Alemão"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr ""
-"_: teclado\n"
-"Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr ""
-"_: teclado\n"
-"Espanhol"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr ""
-"_: teclado\n"
-"Finlandês"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr ""
-"_: teclado\n"
-"Francês"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Inglês (UK)"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr ""
-"_: teclado\n"
-"Norueguês"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr ""
-"_: teclado\n"
-"Polonês"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr ""
-"_: teclado\n"
-"Russo"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr ""
-"_: teclado\n"
-"Sueco"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Americano (US)"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -698,16 +603,7 @@ msgstr ""
 "_: teclado\n"
 "Albanês"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr ""
-"_: teclado\n"
-"Armênio (velho)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -716,7 +612,7 @@ msgstr ""
 "_: teclado\n"
 "Armênio (máquina de escrever)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -725,7 +621,7 @@ msgstr ""
 "_: teclado\n"
 "Armênio (fonético)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -734,7 +630,7 @@ msgstr ""
 "_: teclado\n"
 "Árabe"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -743,7 +639,7 @@ msgstr ""
 "_: teclado\n"
 "Asturiano"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -752,7 +648,7 @@ msgstr ""
 "_: teclado\n"
 "Azerbaijão (latino)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -761,7 +657,7 @@ msgstr ""
 "_: teclado\n"
 "Belga"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -770,7 +666,7 @@ msgstr ""
 "_: teclado\n"
 "Bengali (layout Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -779,7 +675,7 @@ msgstr ""
 "_: teclado\n"
 "Bengali (layout Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -788,7 +684,7 @@ msgstr ""
 "_: teclado\n"
 "Búlgaro (fonético)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -797,7 +693,7 @@ msgstr ""
 "_: teclado\n"
 "Búlgaro (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -806,7 +702,7 @@ msgstr ""
 "_: teclado\n"
 "Brasileiro (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -815,7 +711,7 @@ msgstr ""
 "_: teclado\n"
 "Bósnio"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -824,7 +720,7 @@ msgstr ""
 "_: teclado\n"
 "Dzongkha/Tibetano"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -833,7 +729,7 @@ msgstr ""
 "_: teclado\n"
 "Bielo-russo"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -842,7 +738,7 @@ msgstr ""
 "_: teclado\n"
 "Suíço (layout Alemão)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -851,16 +747,16 @@ msgstr ""
 "_: teclado\n"
 "Suíço (layout Francês)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
+"Czech (QWERTZ)"
 msgstr ""
 "_: teclado\n"
-"Cherokee silábico"
+"Tcheco (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -869,7 +765,16 @@ msgstr ""
 "_: teclado\n"
 "Tcheco (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr ""
+"_: teclado\n"
+"Alemão"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -878,7 +783,7 @@ msgstr ""
 "_: teclado\n"
 "Alemão (sem acentos)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -887,7 +792,7 @@ msgstr ""
 "_: teclado\n"
 "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -896,7 +801,7 @@ msgstr ""
 "_: teclado\n"
 "Dinamarquês"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -905,7 +810,7 @@ msgstr ""
 "_: teclado\n"
 "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -914,7 +819,7 @@ msgstr ""
 "_: teclado\n"
 "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -923,7 +828,7 @@ msgstr ""
 "_: teclado\n"
 "Dvorak (Francês)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -932,7 +837,7 @@ msgstr ""
 "_: teclado\n"
 "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -941,7 +846,7 @@ msgstr ""
 "_: teclado\n"
 "Dvorak (Norueguês)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -950,7 +855,7 @@ msgstr ""
 "_: teclado\n"
 "Dvorak (Polonês)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -959,7 +864,7 @@ msgstr ""
 "_: teclado\n"
 "Dvorak (Sueco)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -968,7 +873,25 @@ msgstr ""
 "_: teclado\n"
 "Estoniano"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr ""
+"_: teclado\n"
+"Espanhol"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr ""
+"_: teclado\n"
+"Finlandês"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -977,7 +900,16 @@ msgstr ""
 "_: teclado\n"
 "Faroese"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr ""
+"_: Teclado\n"
+"Francês (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -986,16 +918,30 @@ msgstr ""
 "_: Teclado\n"
 "Francês (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr ""
 "_: Teclado\n"
 "Francês (Bepo, somente latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr ""
+"_: Teclado\n"
+"Francês (Bepo, somente latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Inglês (UK)"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1004,7 +950,7 @@ msgstr ""
 "_: teclado\n"
 "Georgiano (layout \"Russo\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1013,7 +959,7 @@ msgstr ""
 "_: teclado\n"
 "Georgiano (layout \"Latino\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1022,7 +968,7 @@ msgstr ""
 "_: teclado\n"
 "Grego"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1031,7 +977,7 @@ msgstr ""
 "_: teclado\n"
 "Grego (politônico)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1040,7 +986,7 @@ msgstr ""
 "_: teclado\n"
 "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1049,7 +995,7 @@ msgstr ""
 "_: teclado\n"
 "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1058,7 +1004,7 @@ msgstr ""
 "_: teclado\n"
 "Croata"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1067,7 +1013,7 @@ msgstr ""
 "_: teclado\n"
 "Húngaro"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1076,7 +1022,7 @@ msgstr ""
 "_: teclado\n"
 "Irlanda"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1085,7 +1031,7 @@ msgstr ""
 "_: teclado\n"
 "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1094,7 +1040,7 @@ msgstr ""
 "_: teclado\n"
 "Israelense"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1103,7 +1049,7 @@ msgstr ""
 "_: teclado\n"
 "Israelense (Fonético)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1112,7 +1058,7 @@ msgstr ""
 "_: teclado\n"
 "Iraniano"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1121,7 +1067,7 @@ msgstr ""
 "_: teclado\n"
 "Islandês"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1130,7 +1076,7 @@ msgstr ""
 "_: teclado\n"
 "Italiano"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1139,7 +1085,7 @@ msgstr ""
 "_: teclado\n"
 "Japonês 106 teclas"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1148,7 +1094,7 @@ msgstr ""
 "_: teclado\n"
 "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1157,7 +1103,7 @@ msgstr ""
 "_: teclado\n"
 "Kyrgyz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1166,7 +1112,7 @@ msgstr ""
 "_: teclado\n"
 "Coreano"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1175,7 +1121,7 @@ msgstr ""
 "_: teclado\n"
 "Kurdish (manuscrito árabe)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1184,7 +1130,7 @@ msgstr ""
 "_: teclado\n"
 "Latino-americano"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1193,7 +1139,7 @@ msgstr ""
 "_: teclado\n"
 "Laociano"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1202,7 +1148,7 @@ msgstr ""
 "_: teclado\n"
 "Lituano"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1211,7 +1157,7 @@ msgstr ""
 "_: teclado\n"
 "Letoniano"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1220,14 +1166,14 @@ msgstr ""
 "_: teclado\n"
 "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1236,7 +1182,7 @@ msgstr ""
 "_: teclado\n"
 "Macedônio"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1245,7 +1191,7 @@ msgstr ""
 "_: teclado\n"
 "Myanmar (Birmanês)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1254,7 +1200,7 @@ msgstr ""
 "_: teclado\n"
 "Mongoliano (cirílico)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1263,7 +1209,7 @@ msgstr ""
 "_: teclado\n"
 "Maltês (Reino Unido)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1272,14 +1218,14 @@ msgstr ""
 "_: teclado\n"
 "Maltês (EUA)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeriano"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1288,7 +1234,16 @@ msgstr ""
 "_: teclado\n"
 "Holandês"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr ""
+"_: teclado\n"
+"Norueguês"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1297,7 +1252,7 @@ msgstr ""
 "_: teclado\n"
 "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1306,7 +1261,7 @@ msgstr ""
 "_: teclado\n"
 "Polonês (layout QWERTY)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1315,7 +1270,7 @@ msgstr ""
 "_: teclado\n"
 "Polonês (layout QWERTZ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1324,7 +1279,7 @@ msgstr ""
 "_: teclado\n"
 "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1333,7 +1288,7 @@ msgstr ""
 "_: teclado\n"
 "Português"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1342,7 +1297,7 @@ msgstr ""
 "_: teclado\n"
 "Canadense (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1351,7 +1306,7 @@ msgstr ""
 "_: teclado\n"
 "Romeno (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1360,7 +1315,7 @@ msgstr ""
 "_: teclado\n"
 "Romeno (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1369,7 +1324,16 @@ msgstr ""
 "_: Teclado\n"
 "Romeno (básico)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr ""
+"_: teclado\n"
+"Russo"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1378,7 +1342,16 @@ msgstr ""
 "_: teclado\n"
 "Russo (Fonético)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr ""
+"_: teclado\n"
+"Sueco"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1387,7 +1360,7 @@ msgstr ""
 "_: teclado\n"
 "Esloveno"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1396,7 +1369,7 @@ msgstr ""
 "_: teclado\n"
 "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1405,7 +1378,7 @@ msgstr ""
 "_: teclado\n"
 "Eslovaco (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1414,7 +1387,7 @@ msgstr ""
 "_: teclado\n"
 "Eslovaco (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1423,7 +1396,7 @@ msgstr ""
 "_: teclado\n"
 "Saami (Norueguês)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1432,16 +1405,7 @@ msgstr ""
 "_: teclado\n"
 "Saami (suíço/finlandês)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr ""
-"_: teclado\n"
-"Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1450,7 +1414,7 @@ msgstr ""
 "_: teclado\n"
 "Sérvio (cirílico)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1459,7 +1423,7 @@ msgstr ""
 "_: teclado\n"
 "Sírio"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1468,7 +1432,7 @@ msgstr ""
 "_: teclado\n"
 "Sírio (fonético)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1477,7 +1441,7 @@ msgstr ""
 "_: teclado\n"
 "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1486,7 +1450,7 @@ msgstr ""
 "_: teclado\n"
 "Tamil (layout ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1495,7 +1459,7 @@ msgstr ""
 "_: teclado\n"
 "Tamil (máquina de escrever)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1504,7 +1468,7 @@ msgstr ""
 "_: teclado\n"
 "Tailandês (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1513,7 +1477,7 @@ msgstr ""
 "_: teclado\n"
 "Tailandês (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1522,7 +1486,7 @@ msgstr ""
 "_: teclado\n"
 "Tailandês (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1531,7 +1495,7 @@ msgstr ""
 "_: teclado\n"
 "Tifinagh (layout moroccan) (+latino/árabe)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1540,7 +1504,7 @@ msgstr ""
 "_: teclado\n"
 "Tifinagh (fonético) (+latino/árabe)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1549,7 +1513,7 @@ msgstr ""
 "_: teclado\n"
 "Tailandês"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1558,7 +1522,7 @@ msgstr ""
 "_: teclado\n"
 "Turkmen"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1567,7 +1531,7 @@ msgstr ""
 "_: Teclado\n"
 "Turco (\"F\" modelo)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1576,7 +1540,7 @@ msgstr ""
 "_: Teclado\n"
 "Turco (\"Q\" modelo)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1585,7 +1549,7 @@ msgstr ""
 "_: teclado\n"
 "Ucraniano"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1594,17 +1558,27 @@ msgstr ""
 "_: teclado\n"
 "Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Americano (US)"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Americano (US Internacional)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Americano (US Internacional)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (teclado americano com 3 níveis por tecla)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1613,7 +1587,7 @@ msgstr ""
 "_: teclado\n"
 "Usbequistão (Cirílico)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1622,7 +1596,7 @@ msgstr ""
 "_: teclado\n"
 "Vietnamita \"número de linhas\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1631,92 +1605,92 @@ msgstr ""
 "_: teclado\n"
 "Iugoslavo (latim)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Tecla Alt da direita"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Teclas Shift simultaneamente"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Teclas Ctrl e Shift simultaneamente"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Tecla CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Teclas Shift e CapsLock simultaneamente"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Teclas Ctrl e Alt simultaneamente"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Teclas Alt e Shift simultaneamente"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Tecla \"Menu\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Tecla \"Windows\" da esquerda"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Tecla \"Windows\" da direita"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Ambas teclas Ctrl simultaneamente"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Teclas Alt simultaneamente"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Tecla Shift da esquerda"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Tecla Shift da direita"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Tecla Alt da esquerda"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Tecla Ctrl da esquerda"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Tecla Ctrl da direita"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1727,12 +1701,12 @@ msgstr ""
 "permitirá a você mudar entre os diferentes layouts de teclado \n"
 "(ex.: latino e não-latino)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1743,257 +1717,227 @@ msgstr ""
 "Durante a instalação, você precisará usar a tecla Ctrl da Direita\n"
 "para alternar entre os diferentes layouts de teclado."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Mouse"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Padrão"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan/FistMouse (serial)"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Mouse Genérico PS2 com roda"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Mouse Kensington Thinking"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 botão"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Mouse Genérico com 2 Botões"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Mouse Genérico com 3 Botões e emulação de roda"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Roda"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serial"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Mouse Genérico com 3 Botões"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan com emulação de roda"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech Série CC (serial)"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech Série CC (serial) com emulação de roda"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "Série MM"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Mouse Logitech (serial, tipo C7 antigo)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Mouse Logitech (serial, tipo C7 antigo) com emulação de roda"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Mouse Kensington Thinking com emulação de roda"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 botões"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 botões"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 botões com emulação de roda"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Qualquer mouse PS/2 ou USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Forçar evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Controlador S para Microsoft Xbox"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Mouse VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Mouse VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "nenhum"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Sem Mouse"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Testando o mouse"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Escolha o tipo do seu mouse."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Escolha do mouse"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Deseja emulação de 3 botões?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Porta do Mouse"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Escolha em qual porta serial seu mouse está conectado."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulação de botões"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulação do botão 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulação do Botão 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Teste o mouse"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Para ativar o mouse,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MOVA SUA RODA!"
@@ -2054,3 +1998,63 @@ msgstr "Executar Configuração de Gráficos Mageia"
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 "A autenticação é necessária para executar a configuração gráfica Mageia"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr ""
+#~ "_: teclado\n"
+#~ "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr ""
+#~ "_: teclado\n"
+#~ "Francês"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr ""
+#~ "_: teclado\n"
+#~ "Polonês"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr ""
+#~ "_: teclado\n"
+#~ "Armênio (velho)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr ""
+#~ "_: teclado\n"
+#~ "Cherokee silábico"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr ""
+#~ "_: teclado\n"
+#~ "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Mouse"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Mouse VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Mouse VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulação de botões"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulação do botão 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulação do Botão 3"
diff --git a/po/ro.po b/po/ro.po
index 0804e92..95b3198 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-06-18 14:39+0000\n"
 "Last-Translator: Dan <djmarian4u@hotmail.com>\n"
 "Language-Team: Romanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -64,22 +64,22 @@ msgstr "32 Mo"
 msgid "64 MB or more"
 msgstr "peste 64 Mo"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Server X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Alegeți un server X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Configurare ieșiri multiple"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -88,12 +88,12 @@ msgstr ""
 "Sistemul vă permite configurarea mai multor ieșiri de afișare.\n"
 "Ce doriți să faceți?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Alegeți cantitatea de memorie a plăcii grafice"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -104,7 +104,7 @@ msgstr ""
 "funcționalități suplimentare.\n"
 "Doriți să-l utilizați?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -112,43 +112,43 @@ msgid ""
 msgstr ""
 "Pilotul proprietar nu s-a instalat corespunzător, se revine la pilotul liber."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configurează toate ieșirile independent"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Folosește extensia Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Configurează numai placa „%s”%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personalizat"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Configurare placă grafică & ecran"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Ieșire"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Placă grafică"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
@@ -157,32 +157,32 @@ msgstr ""
 "_:Acesta este un dispozitiv de afișare\n"
 "Ecran"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Rezoluție"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opțiuni"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Module"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Fișierul de configurare Xorg este corupt, va fi ignorat."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -195,32 +195,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Alegeți un ecran pentru ieșirea #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Alegeți un ecran"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generic"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Fabricant"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -246,22 +246,22 @@ msgstr ""
 "fel.\n"
 "Dacă nu sînteți sigur, alegeți parametrii conservativi."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Rata de împrospătare orizontală"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Rata de împrospătare verticală"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Alegeți modulele"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -285,7 +285,7 @@ msgstr ""
 "reconfigurați pilotul plăcii grafice din secțiunea „Configurați serverul "
 "grafic” din Centrul de Control Mageia și reselecționați placa grafică."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -306,83 +306,83 @@ msgstr ""
 "depozitul „Nonfree” în secțiunea „Instalați și dezinstalați aplicații” și "
 "instalați manual pachetul cu microcod sau reconfigurați placa grafică."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 de culori (8 biți)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 de mii de culori (15 biți)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 de mii de culori (16 biți)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milioane de culori (24 de biți)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automată"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Rezoluții"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Alta"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Alegeți rezoluția și adîncimea de culoare"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Placă grafică: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Anulează"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Ajutor"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Test de configurare"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Doriți să testați configurația?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Atenție: testul plăcii grafice vă poate bloca sistemul."
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -393,159 +393,164 @@ msgstr ""
 "%s\n"
 "Încercați să schimbați cîțiva parametri"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Părăsire în %d secunde"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Configurația este corectă?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Dezactivează Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "nu"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "da"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Accelerare materială 3D: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Dispunere de tastatură: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Dispunere de tastatură: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tip de maus: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Ecran: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Frecvența orizontală a ecranului: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Frecvența verticală a ecranului: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Placă grafică: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memorie grafică: %s Ko\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Adîncime de culoare: %s:\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rezoluție: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Pilot Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Configurare Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Opțiuni globale"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Dezactivează Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opțiunile plăcii grafice"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Activează semi-transparența (extensia de compoziționare)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Utilizează accelerarea materială pentru cursorul mausului"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Activează accelerarea RENDER (poate cauza erori la afișarea textului)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Activează dublarea ecranului pe un ecran extern"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Activează dublarea ecranului pe un ecran secundar"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Forțează modul de afișare pentru DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Activează tastele BIOS rapide pentru transferul pe ecranul extern"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 "Utilizează EXA în locul XAA (mai performantă pentru randare și "
 "compoziționare)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Interfața grafică la pornire"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Se lansează automat interfața grafică (Xorg) la demararea sistemului"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -566,12 +571,12 @@ msgstr ""
 "\n"
 "Placa grafică are facilitatea TV-OUT?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Ce normă folosește televizorul?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
@@ -580,107 +585,7 @@ msgstr ""
 "_:aspect anormal\n"
 "altul"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr ""
-"_: tastatură\n"
-"Cehă (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr ""
-"_: tastatură\n"
-"Germană"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr ""
-"_: tastatură\n"
-"Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr ""
-"_: tastatură\n"
-"Spaniolă"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr ""
-"_: tastatură\n"
-"Finlandeză"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr ""
-"_: tastatură\n"
-"Franceză"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Tastatură UK"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr ""
-"_: tastatură\n"
-"Norvegiană"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr ""
-"_: tastatură\n"
-"Poloneză"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr ""
-"_: tastatură\n"
-"Rusească"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr ""
-"_: tastatură\n"
-"Suedeză"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Tastatură US"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -689,16 +594,7 @@ msgstr ""
 "_: tastatură\n"
 "Albaneză"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr ""
-"_: tastatură\n"
-"Armeană (veche)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -707,7 +603,7 @@ msgstr ""
 "_: tastatură\n"
 "Armeană (mașină de scris)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -716,7 +612,7 @@ msgstr ""
 "_: tastatură\n"
 "Armeană (fonetică)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -725,7 +621,7 @@ msgstr ""
 "_: tastatură\n"
 "Arabă"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -734,7 +630,7 @@ msgstr ""
 "_: tastatură\n"
 "Asturiană"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -743,7 +639,7 @@ msgstr ""
 "_: tastatură\n"
 "Azerbaidjană (latină)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -752,7 +648,7 @@ msgstr ""
 "_: tastatură\n"
 "Belgiană"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -761,7 +657,7 @@ msgstr ""
 "_: tastatură\n"
 "Bengaleză (dispunere Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -770,7 +666,7 @@ msgstr ""
 "_: tastatură\n"
 "Bengaleză (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -779,7 +675,7 @@ msgstr ""
 "_: tastatură\n"
 "Bulgărească (fonetică)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -788,7 +684,7 @@ msgstr ""
 "_: tastatură\n"
 "Bulgărească (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -797,7 +693,7 @@ msgstr ""
 "_: tastatură\n"
 "Braziliană (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -806,7 +702,7 @@ msgstr ""
 "_: tastatură\n"
 "Bosniacă"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -815,7 +711,7 @@ msgstr ""
 "_: tastatură\n"
 "Dzongkha/Tibetană"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -824,7 +720,7 @@ msgstr ""
 "_: tastatură\n"
 "Bielorusă"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -833,7 +729,7 @@ msgstr ""
 "_: tastatură\n"
 "Elvețiană (dispunere nemțească)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -842,16 +738,16 @@ msgstr ""
 "_: tastatură\n"
 "Elvețiană (dispunere franțuzească)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
+"Czech (QWERTZ)"
 msgstr ""
 "_: tastatură\n"
-"Cherokee syllabics"
+"Cehă (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -860,7 +756,16 @@ msgstr ""
 "_: tastatură\n"
 "Cehă (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr ""
+"_: tastatură\n"
+"Germană"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -869,7 +774,7 @@ msgstr ""
 "_: tastatură\n"
 "Germană (fără taste inactive)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -878,7 +783,7 @@ msgstr ""
 "_: tastatură\n"
 "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -887,7 +792,7 @@ msgstr ""
 "_: tastatură\n"
 "Daneză"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -896,7 +801,7 @@ msgstr ""
 "_: tastatură\n"
 "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -905,7 +810,7 @@ msgstr ""
 "_: tastatură\n"
 "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -914,7 +819,7 @@ msgstr ""
 "_: tastatură\n"
 "Dvorak (Franceză)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -923,7 +828,7 @@ msgstr ""
 "_: tastatură\n"
 "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -932,7 +837,7 @@ msgstr ""
 "_: tastatură\n"
 "Dvorak (Norvegiană)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -941,7 +846,7 @@ msgstr ""
 "_: tastatură\n"
 "Dvorak (Poloneză)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -950,7 +855,7 @@ msgstr ""
 "_: tastatură\n"
 "Dvorak (Suedeză)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -959,7 +864,25 @@ msgstr ""
 "_: tastatură\n"
 "Estoniană"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr ""
+"_: tastatură\n"
+"Spaniolă"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr ""
+"_: tastatură\n"
+"Finlandeză"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -968,7 +891,16 @@ msgstr ""
 "_: tastatură\n"
 "Faroese"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr ""
+"_: tastatură\n"
+"French (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -977,16 +909,30 @@ msgstr ""
 "_: tastatură\n"
 "French (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr ""
 "_: tastatură\n"
 "French (Bepo, doar latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr ""
+"_: tastatură\n"
+"French (Bepo, doar latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Tastatură UK"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -995,7 +941,7 @@ msgstr ""
 "_: tastatură\n"
 "Georgiană (dispunere rusească)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1004,7 +950,7 @@ msgstr ""
 "_: tastatură\n"
 "Georgiană (dispunere latină)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1013,7 +959,7 @@ msgstr ""
 "_: tastatură\n"
 "Grecească"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1022,7 +968,7 @@ msgstr ""
 "_: tastatură\n"
 "Grecească (polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1031,7 +977,7 @@ msgstr ""
 "_: tastatură\n"
 "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1040,7 +986,7 @@ msgstr ""
 "_: tastatură\n"
 "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1049,7 +995,7 @@ msgstr ""
 "_: tastatură\n"
 "Croată"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1058,7 +1004,7 @@ msgstr ""
 "_: tastatură\n"
 "Maghiară"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1067,7 +1013,7 @@ msgstr ""
 "_: tastatură\n"
 "Irlandeză"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1076,7 +1022,7 @@ msgstr ""
 "_: tastatură\n"
 "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1085,7 +1031,7 @@ msgstr ""
 "_: tastatură\n"
 "Israeliană"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1094,7 +1040,7 @@ msgstr ""
 "_: tastatură\n"
 "Israeliană (fonetică)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1103,7 +1049,7 @@ msgstr ""
 "_: tastatură\n"
 "Iraniană"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1112,7 +1058,7 @@ msgstr ""
 "_: tastatură\n"
 "Islandeză"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1121,7 +1067,7 @@ msgstr ""
 "_: tastatură\n"
 "Italiană"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1130,7 +1076,7 @@ msgstr ""
 "_: tastatură\n"
 "Japoneză (106 taste)"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1139,7 +1085,7 @@ msgstr ""
 "_: tastatură\n"
 "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1148,7 +1094,7 @@ msgstr ""
 "_: tastatură\n"
 "Kirghiză"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1157,7 +1103,7 @@ msgstr ""
 "_: tastatură\n"
 "Coreeană"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1166,7 +1112,7 @@ msgstr ""
 "_: tastatură\n"
 "Kurdă (arabic script)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1175,7 +1121,7 @@ msgstr ""
 "_: tastatură\n"
 "America Latină"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1184,7 +1130,7 @@ msgstr ""
 "_: tastatură\n"
 "Laoțiană"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1193,7 +1139,7 @@ msgstr ""
 "_: tastatură\n"
 "Lituaniană"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1202,7 +1148,7 @@ msgstr ""
 "_: tastatură\n"
 "Letonă"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1211,7 +1157,7 @@ msgstr ""
 "_: tastatură\n"
 "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1220,7 +1166,7 @@ msgstr ""
 "_: tastatură\n"
 "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1229,7 +1175,7 @@ msgstr ""
 "_: tastatură\n"
 "Macedoneană"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1238,7 +1184,7 @@ msgstr ""
 "_: tastatură\n"
 "Myanmar (Burma)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1247,7 +1193,7 @@ msgstr ""
 "_: tastatură\n"
 "Mongolă (chirilic)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1256,7 +1202,7 @@ msgstr ""
 "_: tastatură\n"
 "Malteză (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1265,7 +1211,7 @@ msgstr ""
 "_: tastatură\n"
 "Malteză (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1274,7 +1220,7 @@ msgstr ""
 "_: tastatură\n"
 "Nigeriană"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1283,7 +1229,16 @@ msgstr ""
 "_: tastatură\n"
 "Olandeză"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr ""
+"_: tastatură\n"
+"Norvegiană"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1292,7 +1247,7 @@ msgstr ""
 "_: tastatură\n"
 "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1301,7 +1256,7 @@ msgstr ""
 "_: tastatură\n"
 "Poloneză (dispunere qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1310,7 +1265,7 @@ msgstr ""
 "_: tastatură\n"
 "Poloneză (dispunere qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1319,7 +1274,7 @@ msgstr ""
 "_: tastatură\n"
 "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1328,7 +1283,7 @@ msgstr ""
 "_: tastatură\n"
 "Portugheză"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1337,7 +1292,7 @@ msgstr ""
 "_: tastatură\n"
 "Canadiană (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1346,7 +1301,7 @@ msgstr ""
 "_: tastatură\n"
 "Românească (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1355,7 +1310,7 @@ msgstr ""
 "_: tastatură\n"
 "Românească (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1364,7 +1319,16 @@ msgstr ""
 "_: tastatură\n"
 "Românească (obişnuită)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr ""
+"_: tastatură\n"
+"Rusească"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1373,7 +1337,16 @@ msgstr ""
 "_: tastatură\n"
 "Rusească (fonetică)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr ""
+"_: tastatură\n"
+"Suedeză"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1382,7 +1355,7 @@ msgstr ""
 "_: tastatură\n"
 "Slovenă"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1391,7 +1364,7 @@ msgstr ""
 "_: tastatură\n"
 "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1400,7 +1373,7 @@ msgstr ""
 "_: tastatură\n"
 "Slovacă (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1409,7 +1382,7 @@ msgstr ""
 "_: tastatură\n"
 "Slovacă (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1418,7 +1391,7 @@ msgstr ""
 "_: tastatură\n"
 "Saami (norvegiană)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1427,16 +1400,7 @@ msgstr ""
 "_: tastatură\n"
 "Saami (Suedia/Finlanda)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr ""
-"_: tastatură\n"
-"Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1445,7 +1409,7 @@ msgstr ""
 "_: tastatură\n"
 "Sîrbească (dispunere chirilică)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1454,7 +1418,7 @@ msgstr ""
 "_: tastatură\n"
 "Siriană"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1463,7 +1427,7 @@ msgstr ""
 "_: tastatură\n"
 "Siriană (fonetică)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1472,7 +1436,7 @@ msgstr ""
 "_: tastatură\n"
 "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1481,7 +1445,7 @@ msgstr ""
 "_: tastatură\n"
 "Tamilă (TSCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1490,7 +1454,7 @@ msgstr ""
 "_: tastatură\n"
 "Tamilă (mașină de scris)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1499,7 +1463,7 @@ msgstr ""
 "_: tastatură\n"
 "Tailandeză (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1508,7 +1472,7 @@ msgstr ""
 "_: tastatură\n"
 "Tailandeză (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1517,7 +1481,7 @@ msgstr ""
 "_: tastatură\n"
 "Tailandeză (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1526,7 +1490,7 @@ msgstr ""
 "_: tastatură\n"
 "Tifinagh (dispunere marocană) (+latină/arabă)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1535,7 +1499,7 @@ msgstr ""
 "_: tastatură\n"
 "Tifinagh (fonetică) (+latină/arabă)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1544,7 +1508,7 @@ msgstr ""
 "_: tastatură\n"
 "Tadjică"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1553,7 +1517,7 @@ msgstr ""
 "_: tastatură\n"
 "Turkmenă"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1562,7 +1526,7 @@ msgstr ""
 "_: tastatură\n"
 "Turcească (model „F”)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1571,7 +1535,7 @@ msgstr ""
 "_: tastatură\n"
 "Turcească (model „Q”)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1580,7 +1544,7 @@ msgstr ""
 "_: tastatură\n"
 "Ucrainiană"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1589,17 +1553,27 @@ msgstr ""
 "_: tastatură\n"
 "Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Tastatură US"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Tastatură US (internațional)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Tastatură US (internațional)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (dispunere US cu 3 opțiuni pe tastă)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1608,7 +1582,7 @@ msgstr ""
 "_: tastatură\n"
 "Uzbecă (chirilică)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1617,7 +1591,7 @@ msgstr ""
 "_: tastatură\n"
 "Vietnameză „rînd numeric” QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1626,92 +1600,92 @@ msgstr ""
 "_: tastatură\n"
 "Iugoslavă (latină)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Tasta Alt dreapta"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Ambele taste Shift simultan"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Tastele Ctrl și Shift simultan"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Tasta CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Tastele Shift și CapsLock simultan"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Tastele Ctrl și Alt simultan"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Tastele Alt și Shift simultan"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Tasta „Menu”"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Tasta „Windows” stînga"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Tasta „Windows” dreapta"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Ambele taste Control simultan"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Ambele taste Alt simultan"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Tasta Shift stînga"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Tasta Shift dreapta"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Tasta Alt stînga"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Tasta Control stînga"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Tasta Control dreapta"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1722,12 +1696,12 @@ msgstr ""
 "permite comutarea între diferitele dispuneri ale tastaturii\n"
 "(de ex: latină și non-latină)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Avertisment"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1738,257 +1712,227 @@ msgstr ""
 "În cursul instalării, trebuie utilizată tasta Ctrl dreapta\n"
 "pentru a comuta între dispunerile tastaturii."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Maus - Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Maus PS/2 generic cu rotiță"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Maus Kensington Thinking"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 buton"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Maus generic cu 2 butoane"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Maus generic cu 3 butoane cu rotiță emulată"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rotiță"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serial"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Maus generic cu 3 butoane"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan cu rotiță emulată"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Seria Logitech CC cu rotiță emulată"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Maus Logitech (serial, tip vechi C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Maus Logitech (serial, tip C7 vechi) cu rotiță emulată"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Maus Kensington Thinking cu rotiță emulată"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 butoane"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 butoane"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 butoane cu rotiță emulată"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Orice maus PS/2 sau USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Forțează evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Manetă S Microsoft Xbox"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Maus VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Maus VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "niciuna"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Fără maus"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Testarea mausului"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Alegeți tipul de maus folosit."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Alegere maus"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emulați al treilea buton?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Port maus"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Pe ce port serial este conectat mausul?"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulare butoane"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulare buton 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulare buton 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Testați mausul"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Pentru a activa mausul,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MIȘCAȚI ROTIȚA!"
@@ -2051,3 +1995,63 @@ msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 "Autentificare necesară pentru lansarea aplicației Mageia de configurat "
 "interfața grafică"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr ""
+#~ "_: tastatură\n"
+#~ "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr ""
+#~ "_: tastatură\n"
+#~ "Franceză"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr ""
+#~ "_: tastatură\n"
+#~ "Poloneză"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr ""
+#~ "_: tastatură\n"
+#~ "Armeană (veche)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr ""
+#~ "_: tastatură\n"
+#~ "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr ""
+#~ "_: tastatură\n"
+#~ "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Maus - Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Maus VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Maus VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulare butoane"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulare buton 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulare buton 3"
diff --git a/po/ru.po b/po/ru.po
index 70ee820..8d2a7b2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# 
+#
 # Translators:
 # Alexander Kazancev <kazancas@mandriva.ru>, 2009
 # Alexander Kuzmenkov <rc@mezon.ru>, 2007
@@ -11,15 +11,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-11-04 13:26+0000\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/"
+"ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #: ../lib/Xconfig/card.pm:20
 #, c-format
@@ -66,1627 +69,1661 @@ msgstr "32 МБ"
 msgid "64 MB or more"
 msgstr "64 МБ или больше"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X-сервер"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Выберите X-сервер"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Настройка нескольких ядер"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
-msgstr "Ваша система поддерживает конфигурацию с несколькими графическими ядрами.\nЧто вы хотите сделать?"
+msgstr ""
+"Ваша система поддерживает конфигурацию с несколькими графическими ядрами.\n"
+"Что вы хотите сделать?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Укажите объём памяти вашей видеокарты"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
-"There is a proprietary driver available for your video card which may support additional features.\n"
+"There is a proprietary driver available for your video card which may "
+"support additional features.\n"
 "Do you wish to use it?"
-msgstr "Для вашей видеокарты доступны проприетарные драйверы, которые могут обеспечить дополнительные функциональные возможности.\nХотите использовать их?"
+msgstr ""
+"Для вашей видеокарты доступны проприетарные драйверы, которые могут "
+"обеспечить дополнительные функциональные возможности.\n"
+"Хотите использовать их?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr "Проприетарный драйвер не был установлен, используется свободный."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Настроить все головки независимо"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Использовать расширение Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Настроить только карту \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Выборочно"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Настройка видеокарты и монитора"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Выход"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Видеокарта"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Монитор"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Разрешение"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Проверить"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Параметры"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Модули"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Ваш конфигурационный файл Xorg  неверен, мы его игнорируем."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
 "The current configuration is:\n"
 "\n"
 "%s"
-msgstr "Сохранить изменения?\nТекущие настройки:\n\n%s"
+msgstr ""
+"Сохранить изменения?\n"
+"Текущие настройки:\n"
+"\n"
+"%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Выберите монитор для головы #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Выберите монитор"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n'Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Обычный"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Производитель"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
-"The two critical parameters are the vertical refresh rate, which is the rate\n"
+"The two critical parameters are the vertical refresh rate, which is the "
+"rate\n"
 "at which the whole screen is refreshed, and most importantly the horizontal\n"
 "sync rate, which is the rate at which scanlines are displayed.\n"
 "\n"
-"It is VERY IMPORTANT that you do not specify a monitor type with a sync range\n"
-"that is beyond the capabilities of your monitor: you may damage your monitor.\n"
+"It is VERY IMPORTANT that you do not specify a monitor type with a sync "
+"range\n"
+"that is beyond the capabilities of your monitor: you may damage your "
+"monitor.\n"
 " If in doubt, choose a conservative setting."
-msgstr "Критическими являются два параметра: частота обновления по вертикали,\nкоторая является частотой обновления всего экрана; и наиболее важный -\nчастота синхронизации по горизонтали, которая является частотой отображения\nстрочной развертки.\n\nОЧЕНЬ ВАЖНО, чтобы вы не выбрали тип монитора с частотами синхронизации за\nпределами возможностей вашего монитора: вы можете испортить свой монитор.\nЕсли сомневаетесь - выберите безопасную установку."
+msgstr ""
+"Критическими являются два параметра: частота обновления по вертикали,\n"
+"которая является частотой обновления всего экрана; и наиболее важный -\n"
+"частота синхронизации по горизонтали, которая является частотой отображения\n"
+"строчной развертки.\n"
+"\n"
+"ОЧЕНЬ ВАЖНО, чтобы вы не выбрали тип монитора с частотами синхронизации за\n"
+"пределами возможностей вашего монитора: вы можете испортить свой монитор.\n"
+"Если сомневаетесь - выберите безопасную установку."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Частота обновления по горизонтали"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Частота обновления по вертикали"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Выберите модули"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
-"The free '%s' driver for your graphics card requires a proprietary firmware package '%s' to be installed, but it was not available on the enabled media.\n"
+"The free '%s' driver for your graphics card requires a proprietary firmware "
+"package '%s' to be installed, but it was not available on the enabled "
+"media.\n"
 "\n"
 "The basic non-accelerated '%s' driver will be configured instead.\n"
 "\n"
-"To enable full graphics support later, enable the 'nonfree' repository section at \"Install and remove software\" and reconfigure the graphics driver by going to \"Set up the graphical server\" at Mageia Control Center and re-selecting your graphics card."
-msgstr "Свободный драйвер '%s' для вашей графической карты требует установленного проприетарного firmware пакета '%s', но его нет на доступных носителях.\n\nВместо него будет сконфигурирован базовый драйвер '%s' без поддержки аппаратного ускорения.\n\nЧтобы позднее включить все возможности графической карты, включите репозиторий 'nonfree' в \"Установка и удаление программ\" и сконфигурируйте графический драйвер через \"Настройка графического сервера\" в Центре управлени Mageia, повторно выбрав вашу графическую карту."
+"To enable full graphics support later, enable the 'nonfree' repository "
+"section at \"Install and remove software\" and reconfigure the graphics "
+"driver by going to \"Set up the graphical server\" at Mageia Control Center "
+"and re-selecting your graphics card."
+msgstr ""
+"Свободный драйвер '%s' для вашей графической карты требует установленного "
+"проприетарного firmware пакета '%s', но его нет на доступных носителях.\n"
+"\n"
+"Вместо него будет сконфигурирован базовый драйвер '%s' без поддержки "
+"аппаратного ускорения.\n"
+"\n"
+"Чтобы позднее включить все возможности графической карты, включите "
+"репозиторий 'nonfree' в \"Установка и удаление программ\" и сконфигурируйте "
+"графический драйвер через \"Настройка графического сервера\" в Центре "
+"управлени Mageia, повторно выбрав вашу графическую карту."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
-"The free '%s' driver for your graphics card requires a proprietary firmware package '%s' to be installed in order for all features (including 3D acceleration) to work properly, but that package was not available in the enabled media.\n"
+"The free '%s' driver for your graphics card requires a proprietary firmware "
+"package '%s' to be installed in order for all features (including 3D "
+"acceleration) to work properly, but that package was not available in the "
+"enabled media.\n"
+"\n"
+"To enable all graphics card features later, enable the 'nonfree' repository "
+"section at \"Install and remove software\" and install the firmware package "
+"manually or reconfigure your graphics card."
+msgstr ""
+"Свободный драйвер '%s' для вашей графической карты требует установленного "
+"проприетарного firmware пакета '%s' для всех возможностей видеокарты "
+"(включая 3D ускорение), но его нет на доступных носителях.\n"
 "\n"
-"To enable all graphics card features later, enable the 'nonfree' repository section at \"Install and remove software\" and install the firmware package manually or reconfigure your graphics card."
-msgstr "Свободный драйвер '%s' для вашей графической карты требует установленного проприетарного firmware пакета '%s' для всех возможностей видеокарты (включая 3D ускорение), но его нет на доступных носителях.\n\nЧтобы позднее включить все возможности графической карты, включите репозиторий 'nonfree' в \"Установка и удаление программ\" и вручную установите пакет firmware или переконфигурируйте вашу графическую карту."
+"Чтобы позднее включить все возможности графической карты, включите "
+"репозиторий 'nonfree' в \"Установка и удаление программ\" и вручную "
+"установите пакет firmware или переконфигурируйте вашу графическую карту."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 цветов (8 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 тысячи цветов (15 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 тысяч цветов (16 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 миллионов цветов (24 бита)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Автоматический"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Разрешения"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Другие"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Выберите разрешение и глубину цвета"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Видеокарта: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "ОК"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Справка"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Проверка настроек"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Хотите протестировать настройки?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
-msgstr "Предупреждение: тестирование этой видеокарты может подвесить ваш компьютер"
+msgstr ""
+"Предупреждение: тестирование этой видеокарты может подвесить ваш компьютер"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
 "%s\n"
 "Try to change some parameters"
-msgstr "Возникла ошибка:\n%s\nПопробуйте изменить некоторые параметры"
+msgstr ""
+"Возникла ошибка:\n"
+"%s\n"
+"Попробуйте изменить некоторые параметры"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Закроется через %d секунд"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Это правильная настройка?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Отключить Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "нет"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "да"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Аппаратное 3D-ускорение: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Раскладка клавиатуры: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Раскладка клавиатуры: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Тип мыши: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Монитор: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "HorizSync монитора: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "VertRefresh монитора: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Видеокарта: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Видеопамять: %s КБ\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Глубина цвета: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Разрешение: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Драйвер Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Настройка Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Глобальные параметры"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Отключить Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Параметры видеокарты"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Включить прозрачность (расширение Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Использовать для курсора мыши аппаратное ускорение"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
-msgstr "Включить ускорение RENDER (это может привести к проблемам с отображением текста)"
+msgstr ""
+"Включить ускорение RENDER (это может привести к проблемам с отображением "
+"текста)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Включить дублирование экрана на внешнем мониторе"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Включить дублирование экрана на втором мониторе"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Принудительно включить вывод на DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Включить горячие клавиши BIOS для переключения внешнего монитора"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
-msgstr "Использовать EXA вместо XAA (улучшенная производительность для Render и Composite)"
+msgstr ""
+"Использовать EXA вместо XAA (улучшенная производительность для Render и "
+"Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Графический интерфейс при загрузке"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
-msgstr "Автоматический запускать графический интерфейс (Xorg) во время загрузки"
+msgstr ""
+"Автоматический запускать графический интерфейс (Xorg) во время загрузки"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
 "It can be configured to work using frame-buffer.\n"
 "\n"
-"For this you have to plug your graphic card to your TV before booting your computer.\n"
+"For this you have to plug your graphic card to your TV before booting your "
+"computer.\n"
 "Then choose the \"TVout\" entry in the bootloader\n"
 "\n"
 "Do you have this feature?"
-msgstr "Похоже, что у вашей видеокарты имеется разъём TV-OUT.\nОн может быть настроен для работы с использованием видеобуфера.\n\nДля этого сначала подключите видеокарту к телевизору перед загрузкой компьютера.\nА затем выберите пункт \"TVout\" в начальном загрузчике.\n\nЕсть у вас этот разъем?"
+msgstr ""
+"Похоже, что у вашей видеокарты имеется разъём TV-OUT.\n"
+"Он может быть настроен для работы с использованием видеобуфера.\n"
+"\n"
+"Для этого сначала подключите видеокарту к телевизору перед загрузкой "
+"компьютера.\n"
+"А затем выберите пункт \"TVout\" в начальном загрузчике.\n"
+"\n"
+"Есть у вас этот разъем?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Какой формат использует ваш телевизор?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "другое"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Чешская (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Немецкая"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Дворака"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Испанская"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Финская"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Французская"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK клавиатура"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Норвежская"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Польская"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Русская"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Шведская"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US клавиатура "
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Албанская"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Армянская (старая)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Армянская (машинописная)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Армянская (фонетическая)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Арабская"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Астурийская"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Азербайджанская (латинская)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Бельгийская"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (Inscript-layout)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Болгарская (фонетическая)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Болгарская (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Бразильская (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Боснийская"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetan"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Белорусская"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Швейцарская (немецкая раскладка)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Швейцарская (французская раскладка)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Чешская (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Чешская (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Немецкая"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Немецкая (без мертвых клавиш)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Деванагари"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Датская"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Дворака (США)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (French)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Дворака (норвежская)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polish)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Дворака (шведская)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Эстонская"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Испанская"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Финская"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faroese"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr ""
+"_: клавиатура\n"
+"Французская (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
-msgstr "_: клавиатура\nФранцузская (Bepo)"
+msgstr ""
+"_: клавиатура\n"
+"Французская (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
-msgstr "_: клавиатура\nФранцузская (Bepo, только latin-9)"
+"French (Bepo latin9)"
+msgstr ""
+"_: клавиатура\n"
+"Французская (Bepo, только latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr ""
+"_: клавиатура\n"
+"Французская (Bepo, только latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK клавиатура"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Грузинская (\"русская\" раскладка)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Грузинская (\"латинская\" раскладка)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Греческая"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Греческий (polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Гуджаратская"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Гурмуки"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Хорватская"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Венгерская"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Ирландский"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Инуктитут"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Израильская"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Израильская (фонетическая)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Иранская"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Исландская"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Итальянская"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Японская 106 клавиш"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Киргизская клавиатура"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Корейская клавиатура"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdish (arabic script)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Латиноамериканская"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Лаосская"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Литовская"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Латвийская"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Малайская"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Маори"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Македонская"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Мьянмская (Бирма)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Монгольская (кириллическая)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Мальтийская (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Мальтийская (США)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Нигерийская"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Голландская"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Норвежская"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Орисса"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Польская (раскладка QWERTY)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Польская (раскладка QWERTZ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Португальская"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Канадская (Квебек)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Румынская (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Румынская (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
-msgstr "_: клавиатура\nРумынская (базовая)"
+msgstr ""
+"_: клавиатура\n"
+"Румынская (базовая)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Русская"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Русская (фонетическая)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Шведская"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Словенская"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Словацкая (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Словацкая (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norwegian)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (swedish/finnish)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Сербская (кириллическая)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Сирийский"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Сирийская (фонетическая)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Тамильская (раскладка ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Тамильская (машинописная раскладка)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (moroccan layout) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (phonetic) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Таджикская клавиатура"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Туркменская"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Турецкая (\"F\" модель)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Турецкая (\"Q\" модель)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Украинская"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Клавиатура Урду"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US клавиатура "
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US-клавиатура (международная)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US-клавиатура (международная)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (US-клавиатура с тремя уровнями 3 на клавишу)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Узбекская (кириллическая)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Вьетнамская \"числовой ряд\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Югославская (латинская)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Правая клавиша Alt"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Обе клавиши Shift одновременно"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Клавиши Control и Shift одновременно"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Клавиша CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Клавиши Shift и CapsLock одновременно"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Клавиши Ctrl и Alt одновременно"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Клавиши Alt и Shift одновременно"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Клавиша \"Меню\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Левая клавиша \"Windows\""
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Правая клавиша \"Windows\""
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Обе клавиши Control одновременно"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Обе клавиши Alt одновременно"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Левая клавиша Shift"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Правая клавиша Shift"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Левая клавиша Alt"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Левая клавиша Control"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Правая клавиша Control"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
 "allow switching between the different keyboard layouts\n"
 "(eg: latin and non latin)"
-msgstr "сейчас можно выбрать клавишу или комбинацию клавиш для\nпереключения между различными раскладками клавиатуры\n(например: английской и русской)"
+msgstr ""
+"сейчас можно выбрать клавишу или комбинацию клавиш для\n"
+"переключения между различными раскладками клавиатуры\n"
+"(например: английской и русской)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
 "During installation, you will need to use the Right Control\n"
 "key to switch between the different keyboard layouts."
-msgstr "Данные настройки вступят в силу после установки системы.\nВ процессе установки для переключения между различными\nраскладками клавиатуры используйте клавишу «Правый Control»."
-
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Мышь Sun"
+msgstr ""
+"Данные настройки вступят в силу после установки системы.\n"
+"В процессе установки для переключения между различными\n"
+"раскладками клавиатуры используйте клавишу «Правый Control»."
 
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Стандартный"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Стандартная мышь PS2 с колесиком"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 кнопка"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Стандартная мышь с 2-я кнопками"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Стандартная трёхкнопочная мышь с эмуляцией ролика"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Колесико"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "последовательная"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Стандартная мышь с 3-я кнопками"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan с эмуляцией ролика"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series с эмуляцией ролика"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (последовательная, старого типа C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Мышь Logitech (последовательная, старого типа C7) с эмуляцией ролика"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Мышь Kensington Thinking с эмуляцией ролика"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 кнопки"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 кнопки"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Три кнопки с эмуляцией ролика"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Универсальный"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Любая PS/2 & USB мышь"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Принудительный запуск evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Контроллер S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Мышь VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Мышь VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "отсутствует"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Мышь отсутствует"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Тестирование мыши"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Выберите тип своей мыши."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Выбор мыши"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Эмулировать третью кнопку?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Порт мыши"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Укажите порт, к которому подключена мышь."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Эмуляция кнопок"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Эмуляция двух кнопок"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Эмуляция трёх кнопок"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Протестируйте свою мышь"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Чтобы привести мышь в действие,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ПОКРУТИТЕ КОЛЕСИКО!"
@@ -1744,3 +1781,51 @@ msgstr "Запуск настройки видеокарты и монитора
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "Требуется аутентификация для запуска настройки видеокарты и монитора"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Дворака"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Французская"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Польская"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Армянская (старая)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Мышь Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Мышь VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Мышь VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Эмуляция кнопок"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Эмуляция двух кнопок"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Эмуляция трёх кнопок"
diff --git a/po/sc.po b/po/sc.po
index 776671f..6467358 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-sc\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2005-09-14 11:29+0100\n"
 "Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
 "Language-Team: Sardu\n"
@@ -60,22 +60,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB o prus"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Sçobera unu X server"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Assètiu multi-head"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -84,12 +84,12 @@ msgstr ""
 "Su sistema suportat assètius a (multi-head).\n"
 "Ita bolis fai?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Sçobera su manniori de memòria de sa skeda gràfiga"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -97,82 +97,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Assètia totu is concas (head) una a una"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Imprea alladiaduras Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Assètia feti sa skeda \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personalisada"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Assètiu Acàpiu"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Bessi"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Skeda gràfiga"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Bisori"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Arresolutzioni"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Sceras"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Su file de assètiu de Xorg est purdiau, d'eus a innyorai."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -185,32 +185,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Sçobera unu bisori po sa conca #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Sçobera unu bisori"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Genèrigu"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Produsidori"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -234,22 +234,22 @@ msgstr ""
 "bisori.\n"
 " Ki ses in duda, sçobera unu assètiu moderau."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Frecuèntzia de arrecasçu crocau"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Frecuèntzia de arrecasçu strantaxu"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Sçobera atzioni"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -264,7 +264,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -277,83 +277,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 coloris (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 milla coloris (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 milla coloris (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 millionis de coloris (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automàtigu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Arresolutzionis"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Atru"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Sçobera s'arresolutzioni e sa profundidadi de colori"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Skeda gràfiga: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Annudda"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Ajudu"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Test de s'assètiu"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Bolis fai su test de s'assètiu?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Atentu: "
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -364,152 +364,157 @@ msgstr ""
 "%s\n"
 "Prova a mudai cancu paràmetru"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Bessu aintru de %d segundus"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Est s'assètiu justu?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "No fatzas"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "yes"
 msgstr "Eya"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Skema de su tecrau: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Skema de su tecrau: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipu de sòrixi: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Bisori: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Frecuèntzia Bisori crocada: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Frecuèntzia Bisori strantaxa: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Skeda gràfiga: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memòria gràfiga: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Profundidadi de colori: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Arresolutzioni: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg driver: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Assètiu de Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, fuzzy, c-format
 msgid "Global options"
 msgstr "Sceras de càrrigu"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Skeda gràfiga: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Interfaci gràfiga a s'alluidura"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
@@ -517,7 +522,7 @@ msgstr ""
 "(Xorg) a s'alluidura.\n"
 "Bolis a fai partiri Xorg candu torras a allui?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -538,922 +543,899 @@ msgstr ""
 "\n"
 "Bolis tenni custa possibilidadi?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "De cali standard est sa TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "atru"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Czech (QWERTZ)"
+"Albanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
-"German"
+"Armenian (typewriter)"
 msgstr ""
 
-#: ../lib/keyboard.pm:189
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dvorak"
+"Armenian (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Spanish"
+"Arabic"
 msgstr ""
 
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Finnish"
+"Asturian"
 msgstr ""
 
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
-"French"
+"Azerbaidjani (latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
+#: ../lib/keyboard.pm:192
 #, c-format
-msgid "UK keyboard"
-msgstr "Tecrau UK"
+msgid ""
+"_: keyboard\n"
+"Belgian"
+msgstr ""
 
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Norwegian"
+"Bengali (Inscript-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:195
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Polish"
+"Bengali (Probhat)"
 msgstr ""
 
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Russian"
+"Bulgarian (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Swedish"
+"Bulgarian (BDS)"
 msgstr ""
 
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
+#: ../lib/keyboard.pm:197
 #, c-format
-msgid "US keyboard"
-msgstr "Tecrau US"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
+msgstr ""
 
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Albanian"
+"Bosnian"
 msgstr ""
 
-#: ../lib/keyboard.pm:201
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Armenian (old)"
+"Dzongkha/Tibetan"
 msgstr ""
 
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Armenian (typewriter)"
+"Belarusian"
 msgstr ""
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Armenian (phonetic)"
+"Swiss (German layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Arabic"
+"Swiss (French layout)"
 msgstr ""
 
 #: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Asturian"
+"Czech (QWERTZ)"
 msgstr ""
 
 #: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Azerbaidjani (latin)"
+"Czech (QWERTY)"
 msgstr ""
 
 #: ../lib/keyboard.pm:207
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Belgian"
+"German"
 msgstr ""
 
 #: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bengali (Inscript-layout)"
+"German (no dead keys)"
 msgstr ""
 
 #: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bengali (Probhat)"
+"Devanagari"
 msgstr ""
 
 #: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bulgarian (phonetic)"
+"Danish"
 msgstr ""
 
 #: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bulgarian (BDS)"
+"Dvorak (US)"
 msgstr ""
 
 #: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Brazilian (ABNT-2)"
+"Dvorak (Esperanto)"
 msgstr ""
 
 #: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bosnian"
+"Dvorak (French)"
 msgstr ""
 
 #: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dzongkha/Tibetan"
+"Dvorak (UK)"
 msgstr ""
 
 #: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Belarusian"
+"Dvorak (Norwegian)"
 msgstr ""
 
 #: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Swiss (German layout)"
+"Dvorak (Polish)"
 msgstr ""
 
 #: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Swiss (French layout)"
-msgstr ""
-
-#: ../lib/keyboard.pm:219
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Cherokee syllabics"
-msgstr ""
-
-#: ../lib/keyboard.pm:221
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTY)"
-msgstr ""
-
-#: ../lib/keyboard.pm:223
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German (no dead keys)"
-msgstr ""
-
-#: ../lib/keyboard.pm:224
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Devanagari"
-msgstr ""
-
-#: ../lib/keyboard.pm:225
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Danish"
-msgstr ""
-
-#: ../lib/keyboard.pm:226
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak (US)"
+"Dvorak (Swedish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dvorak (Esperanto)"
-msgstr ""
-
-#: ../lib/keyboard.pm:228
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak (French)"
+"Estonian"
 msgstr ""
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:219
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dvorak (UK)"
+"Spanish"
 msgstr ""
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:220
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dvorak (Norwegian)"
+"Finnish"
 msgstr ""
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dvorak (Polish)"
+"Faroese"
 msgstr ""
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:222
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Dvorak (Swedish)"
+"French (Azerty standard)"
 msgstr ""
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Estonian"
+"French (Bepo)"
 msgstr ""
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:224
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Faroese"
+"French (Bepo latin9)"
 msgstr ""
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:225
 #, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo)"
+"French (Azerty latin9)"
 msgstr ""
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:226
 #, c-format
-msgid ""
-"_: keyboard\n"
-"French (Bepo, only latin-9)"
-msgstr ""
+msgid "UK keyboard"
+msgstr "Tecrau UK"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr ""
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr ""
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr ""
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr ""
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr ""
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr ""
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr ""
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr ""
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr ""
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr ""
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr ""
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr ""
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr ""
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr ""
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr ""
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr ""
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr ""
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr ""
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr ""
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr ""
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr ""
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr ""
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr ""
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr ""
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr ""
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr ""
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr ""
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr ""
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr ""
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr ""
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr ""
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr ""
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr ""
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr ""
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr ""
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr ""
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr ""
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr ""
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr ""
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr ""
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr ""
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr ""
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr ""
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr ""
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr ""
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr ""
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr ""
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Tecrau US"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Tecrau US (intrenatzionali)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Tecrau US (intrenatzionali)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr ""
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr ""
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr ""
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr ""
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1461,12 +1443,12 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Atentu"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1474,257 +1456,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Mouse"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Sòrixi genèrigu PS2 a arroda"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 butoni"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Sòrixi genèrigu a 2 butonis"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Sòrixi genèrigu a 3 butonis cun emuladori de arroda"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Arroda"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seriali"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Sòrixi genèrigu a 3 butonis"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan cun emuladori de arroda"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr ""
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series cun emuladori de arroda"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (seriali, tipu C7 beçu)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (seriali, tipu C7 beçu) cun emuladori de arroda"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse cun emuladori de arroda"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 butonis"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 butonis"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 butonis cun emuladori de arroda"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universali"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Sòrixis PS/2 & USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Nisçunu sòrixi"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr ""
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Nisçunu sòrixi"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Sçobera su tipu de sòrixi."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Sçoberu de su sòrixi"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr ""
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Porta de su sòrixi"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Sçobera sa porta seriali ki dui est su sòrixi acapiau."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emuladura de is butonis"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emuladura de su Butoni 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emuladura de su Butoni 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Prova su sòrixi"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Po abivai su sòrixi,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "MOVI S'ARRODA!"
@@ -1786,6 +1738,22 @@ msgstr "Assètiu de su Sonu"
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Mouse"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Nisçunu sòrixi"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emuladura de is butonis"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emuladura de su Butoni 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emuladura de su Butoni 3"
+
 #~ msgid "Mouse test"
 #~ msgstr "Esàmini de su sòrixi"
 
diff --git a/po/sk.po b/po/sk.po
index b98282e..d881196 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2015-05-14 17:32+0000\n"
 "Last-Translator: Milan Baša <minkob@mail.t-com.sk>\n"
 "Language-Team: Slovak (http://www.transifex.com/projects/p/mageia/language/"
@@ -66,22 +66,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB a viac"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Zvoľte si X server"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Nastavenie pre viacej monitorov"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -90,12 +90,12 @@ msgstr ""
 "Váš systém podporuje nastavenie pre viacej monitorov.\n"
 "Čo chcete spraviť?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Zvoľte veľkosť pamäti na grafickej karte"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -106,7 +106,7 @@ msgstr ""
 "rozšírenú sadu funnkcií.\n"
 "Prajete si ho použiť?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -115,75 +115,75 @@ msgstr ""
 "Proprietárny ovládač nebol korektne nainštalovaný, použije sa ovládač "
 "slobodného softvéru."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Nastaviť všetky monitory osobitne"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Použiť Xinerama rozšírenie"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Nastaviť iba kartu \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Vlastný výber"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Nastavenie grafickej karty a monitora"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Koniec"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafická karta"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Rozlíšenie"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Moduly"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Váš konfiguračný súbor pre X.org je nekorektný, bude ignorovaný."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -196,32 +196,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Zvoľte si monitor pre výstup č. %d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Zvoľte si monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Všeobecný"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Výrobca"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -242,22 +242,22 @@ msgstr ""
 "schopnosti vášho monitora. Mohol by sa poškodiť.\n"
 "Ak sa neviete uistiť, zvoľte radšej najprv konzervatívnejšie nastavenie."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horizontálna frekvencia"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikálna frekvencia"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Vybrať moduly"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -280,7 +280,7 @@ msgstr ""
 "grafickej karty tak, že pôjdete na \\\"Hardvér \\\\ Konfigorovať grafiku\\\" "
 "a znovu zvoľte vašu grafickú kartu."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -300,83 +300,83 @@ msgstr ""
 "\\ Inštalovať a odstrániť softvér\\\" a nainštalujte balík ručne, alebo "
 "znovu prenastavte vašu grafickú kartu."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 farieb (8 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tisíc farieb (15 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tisíc farieb (16 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miliónov farieb (24 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automaticky"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Rozlíšenia"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Iné/á"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Zvoľte si rozlíšenie a farebnú hĺbku"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafická karta: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Test konfigurácie"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Chcete otestovať konfiguráciu?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Varovanie: testovanie tejto karty môže zastaviť váš systém"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -387,157 +387,162 @@ msgstr ""
 "%s\n"
 "Skúste zmeniť niektoré parametre"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Opustiť do %d sekúnd"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Je toto správne nastavenie?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Vypnúť Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "nie"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "áno"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D hardvérová akcelerácia: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Rozloženie klávesnice: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Rozloženie klávesnice: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Typ myši: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Horizontálna frekvencia monitoru: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Vertikálna frekvencia monitoru: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafická karta: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafická pamäť: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Farebná hĺbka: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rozlíšenie: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg ovládač: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Konfigurácia Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Globálne voľby"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Vypnúť Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Voľby grafickej karty"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Povoliť priesvitnosť (rozšírenie Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Použiť hardvérovo urýchlený ukazovateľ myši"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Povoliť RENDER akceleráciu (môže spôsobiť chyby pri zobrazovaní textu)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Povoliť duplicitný display na externom monitore"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Povoliť duplicitné zobrazenie na druhom displeji"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Vynútiť DVI mód displeja"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Povoliť horúcu klávesu BIOS pre prepínanie výstupu monitorov"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Použiť EXA namiesto XAA (vyšší výkon renderovania a kompozitu)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X pri štarte"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Automatické spustenie grafického rozhrania (Xorg) po štarte"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -558,922 +563,899 @@ msgstr ""
 "\n"
 "Máte túto funkciu?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Akú normu používa vaša TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "iný"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Česká (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Nemecká"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Španielska"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Fínska"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francúzska"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK klávesnica"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Nórska"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Poľská"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Ruská"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Švédska"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US klávesnica"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albánska"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Arménska (stará)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Arménska (písací stroj)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Arménska (fonetická)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabsky"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Astúrijská"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbajdžanská (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgická"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengálska (\"Inscript\" rozloženie kláves)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengálska (\"Probhat\" rozloženie kláves)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulharská (fonetická)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulharská (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazílska"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnianska"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Tibetská"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Bieloruská"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Švajčiarska (Nemecké rozloženie kláves)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Švajčiarska (Francúzske rozloženie kláves)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Česká (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Česká (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Nemecká"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Nemecká (bez mŕtvych kláves)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagariská"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Dánska"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Francúzska)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Nórska)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Poľská)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Švédska)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estónska"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Španielska"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Fínska"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Fajerské ostrovy"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francúzska"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Francúzska"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Grécka (polytonická)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Grécka (polytonická)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK klávesnica"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gruzínska (\"Ruské\" rozloženie kláves)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gruzínska (\"Latin\" rozloženie kláves)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grécka"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grécka (polytonická)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujaratiská"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhiská"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Chorvátska"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Maďarská"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Írska"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitutská"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Izraelská"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Izraelská (fonetická)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iránska"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandská"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Talianska"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japonská 106 kláves"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannadská"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kyrgizská"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Kórejská klávesnica"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdská (arabsky)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latinsko Americká"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laoská"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litovská"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Lotišská"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalamská"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maorská"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedónska"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmarská (Burmská)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolská (cyrilika)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltézska (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltézska (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigérijská"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Holandský"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Nórska"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriyjská"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Poľská (qwerty rozloženie kláves)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Poľská (qwertz rozloženie kláves)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Paštúnska"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugalská"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadská (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Románska (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Románska (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Románska (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Ruská"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Ruská (fonetická)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Švédska"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovinská"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhalská"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovenská (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovenská (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Nórska)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saámska (švédsky/fínsky)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Srbská (cyrillic)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Sýrska"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Sýrska (fonetická)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telužská"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamilská (TSCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamilská (písací stroj)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thajská (Kedmanee) klávesnica"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thajská (TIS-820) klávesnica"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thajská (Pattachote) klávesnica"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (marocký vzhľad) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonetická) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadžická"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkménska"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turecká (\"F\" model)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turecká (\"Q\" model)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrajinská"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdská"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US klávesnica"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US klávesnica (medzinárodná)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US klávesnica (medzinárodná)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (US klávesnica s 3 možnosťami na klávesu)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbecká (cyrillic)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamská \"numerická\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Juhoslovanská (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "pravý Alt kláves"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "obidve Shift klávesy naraz"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrl a Shift klávesy naraz"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock klávesu"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift a CapsLock klávesy naraz"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl a Alt klávesy naraz"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt a Shift klávesy naraz"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\" kláves"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Ľavý \"Windows\" kláves"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Pravý \"Windows\" kláves"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "obidve Control klávesy naraz"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "obidve Alt klávesy naraz"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Ľavá Shift klávesa"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Pravá Shift klávesa"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Pravá Alt klávesa"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Ľavá klávesa Control"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Pravý Control kláves"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1484,12 +1466,12 @@ msgstr ""
 "ktorých bude možné prepínať medzi rôznymi klávesovými mapami\n"
 "(napr. us a sk)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Varovanie"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1500,257 +1482,227 @@ msgstr ""
 "Počas inštalácie môžete používať pravý Control kláves\n"
 "na prepnutie sa medzi rôznymi klávesovými mapami."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun myš"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Štandardná"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Štandardná PS2 myš s kolieskom"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking myš"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 tlačidlo"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Štandardná myš s 2 tlačidlami"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Štandardná trojtlačidlová myš s emuláciou kolieska"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Koliesko"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "Sériová"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Štandardná trojtlačidlová"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan s emuláciou kolieska"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Séria s emuláciou kolieska"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Séria"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (sériová, starý typ C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (sériová, starý typ C7) s emuláciou kolieska"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking myš s emuláciou kolieska"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "Busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 tlačidlá"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 tlačidlá"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Emulácia 3 tlačidiel s emuláciou kolieska"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Univerzálny"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Ktorákoľvek PS/2 a USB myš"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Vynútiť evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Myš Virtual Boxu"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Myš VMwaru"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "Žiadna"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Žiadna myš"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Testovanie myši"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Prosím, zvoľte typ vašej myši."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Výber myši"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emulovať 3 tlačidlá?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Port myši"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Prosím zvoľte ku ktorému sériovému portu je vaša myš pripojená."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulácia tlačidiel"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulácia druhého tlačidla"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulácia tretieho tlačidla"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Prosím otestujte myš."
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Pre aktiváciu myši,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "POHNITE KOLIESKOM!"
@@ -1808,3 +1760,51 @@ msgstr "Spustiť Mageia nastavenia grafiky"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "Pre spustenie Mageia nastavení grafiky sa vyžaduje overenie"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francúzska"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Poľská"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Arménska (stará)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun myš"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Myš Virtual Boxu"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Myš VMwaru"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulácia tlačidiel"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulácia druhého tlačidla"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulácia tretieho tlačidla"
diff --git a/po/sl.po b/po/sl.po
index af1bc1a..3c4b8df 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-06-15 19:57+0200\n"
 "Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-"
@@ -67,22 +67,22 @@ msgstr "32 MiB"
 msgid "64 MB or more"
 msgstr "64 MiB ali več"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Grafični strežnik"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Izberite grafični strežnik"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Nastavitev večih zaslonov"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -91,12 +91,12 @@ msgstr ""
 "Vaš sistem podpira konfiguracijo z več zasloni.\n"
 "Kaj želite storiti?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Izberite velikost pomnilnika na grafični kartici"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -107,7 +107,7 @@ msgstr ""
 "dodatne funkcije, a njegova koda ni odprta.\n"
 "Ali ga želite uporabiti?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -116,75 +116,75 @@ msgstr ""
 "Ta lastniški gonilnik ni bil pravilno nameščen. Preklapljam na odprtokodni "
 "gonilnik."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Nastavi vsak zaslon posebej"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Uporabi razširitev Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Nastavi samo kartico »%s« %s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Po meri"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Nastavitev grafične kartice in zaslona"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Končaj"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafična kartica"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Zaslon"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Ločljivost"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Preizkus"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Možnosti"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Vstavki"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Nastavitve za grafični strežnik so napačne, zato ne bodo upoštevane."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -197,32 +197,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Izberite zaslon za izhod št. %d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Izberite zaslon"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Splošno"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Proizvajalec"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -244,22 +244,22 @@ msgstr ""
 "zmožnosti vašega, ker ga s tem lahko poškodujete!\n"
 "Če ste v dvomih, izberite konservativno nastavitev."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Vodoravno osveževanje"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Navpično osveževanje"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Izberite vstavke"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -284,7 +284,7 @@ msgstr ""
 "grafično kartico v delu »Nastavite grafični strežnik« s ponovnim izborom "
 "vaše grafične kartice."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -305,85 +305,85 @@ msgstr ""
 "»Namestite in odstranite programe«. Nato ročno namestite lastniško strojno "
 "programsko opremo ali ponovno nastavite gonilnik za vašo grafično kartico."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 barv (8 bitov)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tisoč barv (15 bitov)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tisoč barv (16 bitov)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milijonov barv (24 bitov)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Ločljivosti"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Drugo"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Izberite ločljivost in barvno globino"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafična kartica: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "V redu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Pomoč"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Preizkus nastavitev"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Ali želite preizkusiti nastavitve?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Pozor: preizkušanje te grafične kartice lahko povzroči, da se računalnik "
 "preneha odzivati."
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -394,161 +394,166 @@ msgstr ""
 "%s\n"
 "Spremenite katero od nastavitev"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Izhod čez %d sekund"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Ali je to prava nastavitev?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Onemogoči Ctrl+Alt+Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "ne"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "da"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Strojno 3D pospeševanje: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Razpored tipkovnice: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Razpored tipkovnice: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Vrsta miške: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Zaslon: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Vodoravno osveževanje zaslona: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Navpično osveževanje zaslona: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafična kartica: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafični pomnilnik: %s KiB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Barvna globina: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Ločljivost: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Gonilnik Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Nastavitev grafičnega strežnika Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Globalne možnosti"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Onemogoči Ctrl+Alt+Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Nastavitev grafične kartice"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Omogoči prosojnost (razširitev Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Uporabi strojno pospeševanje za miškin kazalec"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Omogoči pospeševanje RENDER (to lahko povzroči napake pri prikazovanju "
 "besedila)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Na zunanjem zaslonu omogoči podvojen prikaz"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Na drugem zaslonu omogoči podvojen prikaz"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Vsili digitalni izhod DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Omogoči tipko za preklop zunanjega zaslona"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 "Namesto XAA uporabi EXA (boljše zmogljivosti za razširitev Render in "
 "Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Grafični vmesnik ob zagonu"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Pri zagonu sistema samodejno zaženi grafični vmesnik (Xorg)"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -569,922 +574,899 @@ msgstr ""
 "\n"
 "Ali ima vaša kartica TV izhod?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Kateri standard uporablja vaš TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "drugo"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Češka (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Nemška"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorakova"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Španska"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finska"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francoska"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Angleška (Združeno kraljestvo)"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norveška"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Poljska"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Ruska"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Švedska"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Angleška (ZDA)"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanska"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenska (stara)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenska (pisalni stroj)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenska (fonetična)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabska"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Asturijska"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbajdžanska (latinična)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgijska"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalska (razpored inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalska (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bolgarska (fonetična)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bolgarska (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazilska (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosanska"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Tibetanska (Dzongkha)"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Beloruska"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Švicarska (nemški razpored)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Švicarska (francoski razpored)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokeeška zlogovna"
+"Czech (QWERTZ)"
+msgstr "Češka (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Češka (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Nemška"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Nemška (brez mrtvih tipk)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Indijska (devanagari)"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danska"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorakova (ZDA)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorakova (esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorakova (francoska)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorakova (Združeno kraljestvo)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorakova (norveška)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorakova (poljska)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorakova (švedska)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonska"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Španska"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finska"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Farska"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francoska (Bépo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Francoska (Bépo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Francoska (Bépo, samo latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Francoska (Bépo, samo latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Angleška (Združeno kraljestvo)"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gruzijska (»ruski« razpored)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gruzijska (latinica)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grška"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grška (politonična)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Indijska (gujarati)"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Indijska (gurmukhi)"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Hrvaška"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Madžarska"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irska"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Kanadska (inuktitut)"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Izraelska"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Izraelska (fonetična)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranska"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandska"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italijanska"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japonska s 106 tipkami"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Indijska (kannada)"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgiška"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korejska"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdska (arabska pisava)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latinsko ameriška"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laoška"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litvijska"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latvijska"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Indijska (malayalam)"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maorska"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonska"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Mjanmarska (burmanska)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolska (cirilica)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Malteška (Združeno kraljestvo)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Malteška (ZDA)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigerijska"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Nizozemska"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norveška"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Indijska (oriya)"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Poljska (QWERTY)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Poljska (QWERTZ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Afganistanska (Pashto)"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugalska"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadska (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romunska (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romunska (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Romunska (osnovna)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Ruska"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Ruska (fonetična)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Švedska"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovenska"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovaška (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovaška (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Laponska (norveška)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Laponska (švedska/finska)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi (Indija, Pakistan)"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Srbska (cirilica)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Sirska"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Sirska (fonetična)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Indijska (telugu)"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamilska (razpored ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamilska (pisalni stroj)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Tajska (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Tajska (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Tajska (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (maroški razpored) (+latinsko/arabsko)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (fonetsko) (+latinsko/arabsko)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadžiška"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmenska"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turška (tradicionalna, model »F«)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turška (moderna, model »Q«)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrajinska"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Pakistanska (urdu)"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Angleška (ZDA)"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Ameriška (mednarodna)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Ameriška (mednarodna)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (ameriška s tremi nivoji na tipko)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbeška (cirilica)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamska (»numerična vrsta« QWERTY)"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Srbsko - črnogorska (latinica)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Desna tipka Alt"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Obe tipki »Shift« istočasno"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Tipki »Shift« in »Ctrl« istočasno"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Tipka »CapsLock«"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Tipki »Shift« in »CapsLock« istočasno"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Tipki »Ctrl« in »Alt« istočasno"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Tipki »Alt« in »Shift« istočasno"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Tipka »Meni«"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Leva tipka »Windows«"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Desna tipka »Windows«"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Obe tipki »Ctrl« istočasno"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Obe tipki »Alt« istočasno"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Leva tipka »Shift«"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Desna tipka »Shift«"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Leva tipka »Alt«"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Leva tipka »Ctrl«"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Desna tipka »Ctrl«"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1495,12 +1477,12 @@ msgstr ""
 "lahko preklapljali med različnimi razporedi tipk\n"
 "(npr. latiničnim in ciriličnim)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1511,257 +1493,227 @@ msgstr ""
 "Med namestitvijo boste morali za preklapljanje\n"
 "uporabljati desno tipko »Ctrl«."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Mouse"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standardna"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Generična miška PS/2 s kolescem"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 gumb"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Generična miška z dvema gumboma"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Generična miška s tremi gumbi in posnemanjem kolesca"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Kolesce"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serijska"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Generična miška s tremi gumbi"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan s posnemanjem kolesca"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series s posnemanjem kolesca"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (serijska, stari C7 tip)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (serijska, stari C7 tip) s posnemanjem kolesca"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse s posnemanjem kolesca"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 gumba"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 gumbi"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 gumbi s posnemanjem kolesca"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Univerzalna"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Katerakoli miška PS/2 ali USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Vsili splošni vmesnik za vhodne naprave (evdev)"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Miška v VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Miška v VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "brez"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Brez miške"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Preizkus miške"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Izberite vrsto svoje miške"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Izbira miške"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Ali želite posnemanje tretjega gumba?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Vrata za miško"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Izberite zaporedna vrata, na katera je priključena miška"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Posnemanje gumbov"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Posnemanje drugega gumba"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Posnemanje tretjega gumba"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Preizkusite miško"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Za aktiviranje miške,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ZAVRTITE KOLESCE!"
@@ -1822,5 +1774,53 @@ msgstr ""
 "Za zagon Mageia orodja za nastavitev grafične kartice in zaslona je potrebno "
 "overjanje"
 
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorakova"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francoska"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Poljska"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenska (stara)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokeeška zlogovna"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi (Indija, Pakistan)"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Mouse"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Miška v VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Miška v VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Posnemanje gumbov"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Posnemanje drugega gumba"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Posnemanje tretjega gumba"
+
 #~ msgid "3D hardware acceleration"
 #~ msgstr "Strojno 3D pospeševanje"
diff --git a/po/sq.po b/po/sq.po
index 9c327a8..b2577d8 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2019-04-01 13:28+0000\n"
 "Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n"
 "Language-Team: Albanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -63,22 +63,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB ose më shumë"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Server X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Zgjidhni një server X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Konfigurimi i muti-ekraneve"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -87,12 +87,12 @@ msgstr ""
 "Sistemi juaj mund të përdore konfigurimin multi-kokë.\n"
 "Ç'farë dëshironi të bëni?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Zgjidhni madhësinë e memories së kartelës tuaj grafike"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -103,7 +103,7 @@ msgstr ""
 "mund të mbështesin karakteristika të tjera.\n"
 "A dëshironi ta përdorni atë?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -112,43 +112,43 @@ msgstr ""
 "Drejtuesi pronarit nuk është instaluar siç duhet, parazgjedhur për programin "
 "drejtues të lirë."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Konfigurimi i ekraneve veçmas"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Përdor zgjerim Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Konfiguroje vetëm skedën \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Personalizuar"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Karta Grafike & Konfigurimi Monitorit"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Braktise"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Kartë Grafike"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
@@ -157,32 +157,32 @@ msgstr ""
 "_: Kjo është një pajisje\n"
 "Ekran"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Vendosmëria"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Provë"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Alternativat"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Prizatë"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Dokumenti i konfigurimit Xorg është prishur, ne do ta injorojmë atë."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -195,32 +195,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Zgjidhni një monitor për kokë #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Zgjidhni një ekran"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Dëgjues"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Përgjithshëm"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Shitës"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -244,22 +244,22 @@ msgstr ""
 "i cili mund ti tejkalon mundësitë e monitorit tuaj. Që mund ta dëmtoj.\n"
 " Në rast të dyshimit zgjidhni një rregullim më të ulët pa rrezik."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Frekuencë horizontale freskuese"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Frekuencë vertikale freskuese"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Zgjidh plugins"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -284,7 +284,7 @@ msgstr ""
 "kartës grafike duke shkuar tek \"Ndërto grafiken server\" në Qendrën e "
 "Kontrollit Mageia dhe ri-zgjedhjen e kartës tuaj grafike."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -305,84 +305,84 @@ msgstr ""
 "mundëso \"jo të lirë\" seksionin depo në \"Instao dhe fshi programe\" dhe "
 "instaloni paketën firmware manualsiht ose rikonfiguroni kartën tuaj grafike."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 ngjyra (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mijë ngjyra (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mijë ngjyra (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milion ngjyra (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Në mënyrë automatike"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Rezolucion"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Tjetër"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Zgjedhe rezolucion dhe thellësi e ngjyrave"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Kartë grafike: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Dakord"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Anulo"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Ndihmë"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Test i konfigurimit"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "A dëshironi ta testoni konfigurimin?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Kujdes: testimi i kësaj kartele grafike mund ta bllokoj kompjuterin tuaj"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -393,160 +393,165 @@ msgstr ""
 "%s\n"
 "Ndërroni parametrat për ta përmirësuar"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Do ta braktisë për %d sekonda"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "A është ky një rregullim korrekt?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Gjymto Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "jo"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "po"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D përshpejtim pajisjes: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tipi i tastierës: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tipi i tastierës: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tipi i miut: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Frekuencë Horizontale Sinkronizues: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Frekuencë Vertikale Freskuese: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Kartë grafike: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memoria grafike: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Thellësia e ngjyrave: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rezolucioni: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Drejtuesi Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Konfigurimi i Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Opsionet e moduleve:"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Gjymto Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Opsione Kartë grafike"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Aktivizimi i tejdukshmërisë (zgjerimi përbërës)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Përdorni pjesën elektronike përshpejtimit treguesin te miut"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Aktivizo RENDER përshpejtimin (kjo mund të shkaktojë shfaqje teksti të-"
 "metash)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Aktivizo ekran e dublikatë në ekran e dytë"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Mundëso dublikimin e ekranit në ekran e dytë"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Detyro mënyrën e shfaqjes DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Aktivizo kombinim butonash në BIOS për kalim në monitor të jashtëm"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 "Përdor EXA në vend të XAA (Performancë më e mirë për Render dhe të përbëra)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Ndërfaqja grafike në nisje"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Automatikisht fillo ndërfaqen grafike (Xorg) në ndezje"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -566,12 +571,12 @@ msgstr ""
 "\n"
 "A e posedoni këtë funksion?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Cilat norma përdorë televizori juaj?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
@@ -580,111 +585,7 @@ msgstr ""
 "_:raporti i çuditshëm aspekti\n"
 "tjetër"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr ""
-"_: tastierë\n"
-"Çeke (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr ""
-"_: tastierë\n"
-"Gjermane"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr ""
-"_: tastierë\n"
-"Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr ""
-"_: tastierë\n"
-"Spanjolle"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr ""
-"_: tastierë\n"
-"Finlandisht"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr ""
-"_: tastierë\n"
-"Franceze "
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr ""
-"_: tastierë\n"
-"Angleze"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr ""
-"_: tastierë\n"
-"Norvegjeze"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr ""
-"_: tastierë\n"
-"Polake"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr ""
-"_: tastierë\n"
-"Ruse"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr ""
-"_: tastierë\n"
-"Suedeze"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr ""
-"_: tastierë\n"
-"SHBA-ës"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -693,16 +594,7 @@ msgstr ""
 "_: tastierë\n"
 "Shqiptare"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr ""
-"_: tastierë\n"
-"Armene (vjetër)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -711,7 +603,7 @@ msgstr ""
 "_: tastierë\n"
 "Armene (makinë shtypëse)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -720,7 +612,7 @@ msgstr ""
 "_: tastierë\n"
 "Armene (fonetic)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -729,7 +621,7 @@ msgstr ""
 "_: tastierë\n"
 "Arabe"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -738,7 +630,7 @@ msgstr ""
 "_: tastiera\n"
 "Austriake"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -747,7 +639,7 @@ msgstr ""
 "_: tastierë\n"
 "Azerbajxhan (latine)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -756,7 +648,7 @@ msgstr ""
 "_: tastierë\n"
 "Belge"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -765,7 +657,7 @@ msgstr ""
 "_: tastierë\n"
 "Bengali (faqosje-nëskript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -774,7 +666,7 @@ msgstr ""
 "_: tastierë\n"
 "Bengali (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -783,7 +675,7 @@ msgstr ""
 "_: tastierë\n"
 "Bullgare (fonetik)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -792,7 +684,7 @@ msgstr ""
 "_: tastierë\n"
 "Bullgare (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -801,7 +693,7 @@ msgstr ""
 "_: tastierë\n"
 "Braziliane (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -810,7 +702,7 @@ msgstr ""
 "_: tastierë\n"
 "Boshnjake"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -819,7 +711,7 @@ msgstr ""
 "_: tastierë\n"
 "Dzongkha/Tibetan"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -828,7 +720,7 @@ msgstr ""
 "_: tastierë\n"
 "Bjelloruse"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -837,7 +729,7 @@ msgstr ""
 "_: tastierë\n"
 "Zvicerane (gjermanisht)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -846,16 +738,16 @@ msgstr ""
 "_: tastierë\n"
 "Zvicerane (frëngjishte)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
+"Czech (QWERTZ)"
 msgstr ""
 "_: tastierë\n"
-" Cherokee syllabics"
+"Çeke (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -864,7 +756,16 @@ msgstr ""
 "_: tastierë\n"
 "Çeke (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr ""
+"_: tastierë\n"
+"Gjermane"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -873,7 +774,7 @@ msgstr ""
 "_: tastierë\n"
 "Gjermane (pa çelësa të vdekur)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -882,7 +783,7 @@ msgstr ""
 "_: tastierë\n"
 "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -891,7 +792,7 @@ msgstr ""
 "_: tastierë\n"
 "Daneze"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -900,7 +801,7 @@ msgstr ""
 "_: tastierë\n"
 "Dvorak (SHBA)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -909,7 +810,7 @@ msgstr ""
 "_: tastierë\n"
 "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -918,7 +819,7 @@ msgstr ""
 "_: tastierë\n"
 "Dvorak (Franceze)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -927,7 +828,7 @@ msgstr ""
 "_: tastierë\n"
 "Dvorak (Angleze)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -936,7 +837,7 @@ msgstr ""
 "_: tastierë\n"
 "Dvorak (Norvegjeze)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -945,7 +846,7 @@ msgstr ""
 "_: tastierë\n"
 "Dvorak (Polake)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -954,7 +855,7 @@ msgstr ""
 "_: tastierë\n"
 "Dvorak (Suedeze)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -963,7 +864,25 @@ msgstr ""
 "_: tastierë\n"
 "Estoneze"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr ""
+"_: tastierë\n"
+"Spanjolle"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr ""
+"_: tastierë\n"
+"Finlandisht"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -972,7 +891,16 @@ msgstr ""
 "_: tastierë\n"
 "Faroese"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr ""
+"_: tastierë\n"
+"Franceze (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -981,16 +909,32 @@ msgstr ""
 "_: tastierë\n"
 "Franceze (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr ""
 "_: tastierë\n"
 "Franceze (Bepo, vetëm latine-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr ""
+"_: tastierë\n"
+"Franceze (Bepo, vetëm latine-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr ""
+"_: tastierë\n"
+"Angleze"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -999,7 +943,7 @@ msgstr ""
 "_: tastierë\n"
 "Gjeorgjiane (faqosje \"Ruse\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1008,7 +952,7 @@ msgstr ""
 "_: tastierë\n"
 "Gjeorgjiane (faqosje \"Latine\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1017,7 +961,7 @@ msgstr ""
 "_: tastierë\n"
 "Greke"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1026,7 +970,7 @@ msgstr ""
 "_: tastierë\n"
 "Greke (polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1035,7 +979,7 @@ msgstr ""
 "_: tastierë\n"
 "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1044,7 +988,7 @@ msgstr ""
 "_: tastierë\n"
 "Gurmuki"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1053,7 +997,7 @@ msgstr ""
 "_: tastierë\n"
 "Kroate"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1062,7 +1006,7 @@ msgstr ""
 "_: tastierë\n"
 "Hungareze"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1071,7 +1015,7 @@ msgstr ""
 "_: tastierë\n"
 "Irlandeze"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1080,7 +1024,7 @@ msgstr ""
 "_: tastierë\n"
 "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1089,7 +1033,7 @@ msgstr ""
 "_: tastierë\n"
 "Izraelite"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1098,7 +1042,7 @@ msgstr ""
 "_: tastierë\n"
 "Izraelite (fonetik)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1107,7 +1051,7 @@ msgstr ""
 "_: tastierë\n"
 "Iraniane"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1116,7 +1060,7 @@ msgstr ""
 "_: tastierë\n"
 "Islandeze"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1125,7 +1069,7 @@ msgstr ""
 "_: tastierë\n"
 "Italiane"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1134,7 +1078,7 @@ msgstr ""
 "_: tastierë\n"
 "Japoneze 106 butona"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1143,7 +1087,7 @@ msgstr ""
 "_: tastierë\n"
 "Kanadeze"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1152,7 +1096,7 @@ msgstr ""
 "_: tastierë\n"
 "Kyrgyz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1161,7 +1105,7 @@ msgstr ""
 "_: tastierë\n"
 "Koreane"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1170,7 +1114,7 @@ msgstr ""
 "_: tastierë\n"
 "Kurde (arabike skript)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1179,7 +1123,7 @@ msgstr ""
 "_: tastierë\n"
 "Latino-Amerikane"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1188,7 +1132,7 @@ msgstr ""
 "_: tastierë\n"
 "Laotien"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1197,7 +1141,7 @@ msgstr ""
 "_: tastierë\n"
 "Lituaneze"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1206,7 +1150,7 @@ msgstr ""
 "_: tastierë\n"
 "Letonisht"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1215,7 +1159,7 @@ msgstr ""
 "_: tastierë\n"
 "Malajalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1224,7 +1168,7 @@ msgstr ""
 "_: tastierë\n"
 "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1233,7 +1177,7 @@ msgstr ""
 "_: tastierë\n"
 "Maqedonase"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1242,7 +1186,7 @@ msgstr ""
 "_: tastierë\n"
 "Myanmar (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1251,7 +1195,7 @@ msgstr ""
 "_: tastierë\n"
 "Mongole (qirilicë)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1260,7 +1204,7 @@ msgstr ""
 "_: tastierë\n"
 "Maltë (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1269,7 +1213,7 @@ msgstr ""
 "_: tastierë\n"
 "Maltë (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1278,7 +1222,7 @@ msgstr ""
 "_: tastierë\n"
 "Nigeriane"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1287,7 +1231,16 @@ msgstr ""
 "_: tastierë\n"
 "Holandeze"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr ""
+"_: tastierë\n"
+"Norvegjeze"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1296,7 +1249,7 @@ msgstr ""
 "_: tastierë\n"
 "Orija"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1305,7 +1258,7 @@ msgstr ""
 "_: tastierë\n"
 "Polake (qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1314,7 +1267,7 @@ msgstr ""
 "_: tastierë\n"
 "Polake (qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1323,7 +1276,7 @@ msgstr ""
 "_: tastierë\n"
 "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1332,7 +1285,7 @@ msgstr ""
 "_: tastierë\n"
 "Portugeze"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1341,7 +1294,7 @@ msgstr ""
 "_: tastierë\n"
 "Kanadeze (Kebek)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1350,7 +1303,7 @@ msgstr ""
 "_: tastierë\n"
 "Rumune (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1359,7 +1312,7 @@ msgstr ""
 "_: tastierë\n"
 "Rumune (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1368,7 +1321,16 @@ msgstr ""
 "_: tastierë\n"
 "Rumune (minimale)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr ""
+"_: tastierë\n"
+"Ruse"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1377,7 +1339,16 @@ msgstr ""
 "_: tastierë\n"
 "Ruse (fonetik)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr ""
+"_: tastierë\n"
+"Suedeze"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1386,7 +1357,7 @@ msgstr ""
 "_: tastierë\n"
 "Sllovene"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1395,7 +1366,7 @@ msgstr ""
 "_: tastierë\n"
 "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1404,7 +1375,7 @@ msgstr ""
 "_: tastierë\n"
 "Sllovake (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1413,7 +1384,7 @@ msgstr ""
 "_: tastierë\n"
 "Sllovake (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1422,7 +1393,7 @@ msgstr ""
 "_: tastierë\n"
 "Saami (norvegjishte)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1431,16 +1402,7 @@ msgstr ""
 "_: tastierë\n"
 "Saami (suedisht/finish)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr ""
-"_: tastierë\n"
-"Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1449,7 +1411,7 @@ msgstr ""
 "_: tastierë\n"
 "Serbe (qirilicë)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1458,7 +1420,7 @@ msgstr ""
 "_: tastierë\n"
 "Siriak"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1467,7 +1429,7 @@ msgstr ""
 "_: tastierë\n"
 "Siriak (fonetic)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1476,7 +1438,7 @@ msgstr ""
 "_: tastierë\n"
 "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1485,7 +1447,7 @@ msgstr ""
 "_: tastierë\n"
 "Tamile (ISCII-layout)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1494,7 +1456,7 @@ msgstr ""
 "_: tastierë\n"
 "Tamile (makinë shtypëse)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1503,7 +1465,7 @@ msgstr ""
 "_: tastierë\n"
 "Thai (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1512,7 +1474,7 @@ msgstr ""
 "_: tastierë\n"
 "Thai (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1521,7 +1483,7 @@ msgstr ""
 "_: tastierë\n"
 "Thai (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1530,7 +1492,7 @@ msgstr ""
 "_: tastierë\n"
 " Tifinagh (moroccan layout) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1539,7 +1501,7 @@ msgstr ""
 "_: tastierë\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1548,7 +1510,7 @@ msgstr ""
 "_: tastierë\n"
 "Tajike"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1557,7 +1519,7 @@ msgstr ""
 "_: tastierë\n"
 "Turke"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1566,7 +1528,7 @@ msgstr ""
 "_: tastierë\n"
 "Turke (\"F\" model)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1575,7 +1537,7 @@ msgstr ""
 "_: tastierë\n"
 "Turke (\"Q\" model)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1584,7 +1546,7 @@ msgstr ""
 "_: tastierë\n"
 "Ukrainase"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1593,21 +1555,35 @@ msgstr ""
 "_: tastierë\n"
 "Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr ""
+"_: tastierë\n"
+"SHBA-ës"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr ""
 "_: tastierë\n"
 "SHBA-ës (internacional)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr ""
+"_: tastierë\n"
+"SHBA-ës (internacional)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 "_: tastierë\n"
 "ISO9995-3 (Tastiere US me nivele për çelës)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1616,7 +1592,7 @@ msgstr ""
 "_: tastierë\n"
 "Uzbek (qirilicë)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1625,7 +1601,7 @@ msgstr ""
 "_: tastierë\n"
 "Vietnamisht \"kolonë numerike\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1634,92 +1610,92 @@ msgstr ""
 "_: tastierë\n"
 "Jugosllave (latine)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Çelësi Alt djathtas"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Të Dy butonat Shift njëkohshëm"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Butonat e njëkohshëm Control dhe Shift"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Butoni CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift dhe CapsLock butona njëherësh"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Butonat njëkohësisht  Ctrl dhe Alt"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Butonat njëkohësisht Alt dhe Shift"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Butoni \"Meny\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Butoni \"Windows\" majtas"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Butoni \"Windows\" djathtas"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Të Dy butonat Control njëkohshëm"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Të Dy butonat njëkohësish Alt"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Butoni Shift Majtë"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Butoni Shift Djathtas"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Butoni Alt Majtë"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Butoni Majtë Control"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Butoni Control Djathtas"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1730,12 +1706,12 @@ msgstr ""
 "ka mundësi të kalojë në tip të ndryshme të tastierave\n"
 "(shembull: mes latin dhe jo latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Kujdes"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1746,257 +1722,227 @@ msgstr ""
 "Gjatë instalimit, ju duhet ti përdorni kopsat e sakta\n"
 "Kontrolluese që të kaloni në shfaqje të tjera të tastierave."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Miu"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Miu standard PS2 me Rrotë"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Miu Mëndues "
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Gjeni NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Gjeni NetScrol"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Eksplorues"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 buton"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Miu Gjenerik 2 Butona"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Miu Gjenerik me 3 Butona dhe rrotë imituese"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rrota"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "Seri"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Miu Gjenerik me 3 Butona"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan me Rrotë imituese"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Sistemet e Miut"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Seritë"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Serialet me rrotë imituese"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MiuMan+/MiuParë+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Serie"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Miu (seria, tip i vjetër C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Miu Logitech (seria, tip i vjetër C7) me rrotë imituese"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Miu Mendues me Rrotë imituese"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "miubus"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 butona"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 butona"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 butona me Rrotë Imituese"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universale"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Cilido Mi PS/2 & USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Detyro evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Kontrolluesi Xbox S Microsoft-it"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox miu"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware miu"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "asnjë"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Asnjë mi"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Testimi miut"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Ju lutemi zgjidhni tipin e miut tuaj."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Zgjedhja e Miut"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Imitoje butonin e tretë?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Porta e Miut"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Ju lutemi zgjidhni portën seriale, në të cilën është lidhur miu juaj."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Imitues i Butonave"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Imitues 2 Butonave"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Imitues 3 Butonave"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Ju lutemi testoni miun"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Për të aktivizuar miun,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "LËVIZNI RROTËN TUAJ!"
@@ -2056,3 +2002,63 @@ msgstr "Lësho Konfigurimi e Grafikës Mageia"
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 "Vërtetimi është i nevojshëm për të lëshuar Konfigurimin e Grafikës Mageia"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr ""
+#~ "_: tastierë\n"
+#~ "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr ""
+#~ "_: tastierë\n"
+#~ "Franceze "
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr ""
+#~ "_: tastierë\n"
+#~ "Polake"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr ""
+#~ "_: tastierë\n"
+#~ "Armene (vjetër)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr ""
+#~ "_: tastierë\n"
+#~ " Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr ""
+#~ "_: tastierë\n"
+#~ "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Miu"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox miu"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware miu"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Imitues i Butonave"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Imitues 2 Butonave"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Imitues 3 Butonave"
diff --git a/po/sr.po b/po/sr.po
index 89203ff..45afb69 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2004-09-15 13:33+0200\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -61,22 +61,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB или више"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X сервер"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Изаберите X сервер"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-head конфигурација"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -85,12 +85,12 @@ msgstr ""
 "Ваш систем подржава multiple head конфигурацију.\n"
 "Шта желите да урадите?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Количина меморије на графичкој картици"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -98,82 +98,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Подеси све главе независно"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Користи Xinerama екстензију"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Подеси само картицу \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Избор по жељи"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Конфигурација Интернет конекције"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Крај"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Графичка картица"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Монитор"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Резолуција"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Тест"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Опције"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Прикључци"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -186,32 +186,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Изаберите монитор"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Изаберите монитор"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generic"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Произвођач"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -232,22 +232,22 @@ msgstr ""
 "ВЕОМА ЈЕ ВАЖНО да не наведете тип монитора који има овај опсег већи него\n"
 "што га има ваш монитор. Ако нисте сигурни, одаберите мање вредности."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Хоризонтална фреквенција"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Вертикална фреквенција"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Изаберите акцију"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -262,7 +262,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -275,83 +275,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 боја (8-битна палета)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 хиљаде боја (15-битна палета)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 хиљада боја (16-битна палета)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 милиона боја (24-битна палета)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Препознај по наставку"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Резолуција"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Друго"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Изаберите резолуцију и број боја при приказу"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Графичка картица: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "У реду"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Поништи"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Помоћ"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Тестирање конфигурације"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Да ли хоћете да тестирате конфигурацију?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Упозорење: тестирање ове графичке картице може блокирати ваш рачунар"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -362,159 +362,164 @@ msgstr ""
 "%s\n"
 "Покушајте да промените неке од параметара"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Излазим за %d секунди"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Да ли је ово исправно подешено?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "ниједан"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "yes"
 msgstr "Да"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Тип тастатуре: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Тип тастатуре: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Тип миша: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Монитор: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Монитор - хоризонтална фреквенција: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Монитор - вертикално освежавање: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Графичка картица: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Меморија на графичкој картици: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Број боја: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Резолуција: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg драјвер: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg конфигурација"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, fuzzy, c-format
 msgid "Global options"
 msgstr "Опције модула:"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Графичка картица: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X окружење на старту"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Ja могу подести ваш рачунар да аутоматски подиже X окружење при стартању.\n"
 "Да ли желите X окружење при рестарту ?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -535,922 +540,899 @@ msgstr ""
 "\n"
 "Да ли имате ову опцију?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Какав систем ваш TV користи?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Чешки (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Немачки"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Дворак"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Шпански"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Фински"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Француски"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK тастатура"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Норвешки"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Пољски"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Руски"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Шведски"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US тастатура"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Албански"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Јерменски (стари)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Јерменски (typewriter)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Јерменски (фонетски)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Арапски"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Естонски"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Азербејдзан  (латиница)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Белгијски"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Бенгалски (\"Inscript\" распоред)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Бенгалски (\"Probhat\" распоред)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Бугарски (фонетски)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Бугарски (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Бразилски (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Босански"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Босански"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Белоруски"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Швајцарски (Немачки распоред)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Швајцарски (Француски  распоред)"
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Арапски"
+"Czech (QWERTZ)"
+msgstr "Чешки (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Чешки (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Немачки"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Немачки (без мртвих тастера)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Деванагри"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Дански"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Дворак (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Дворак (Норвешки)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Дворак (Норвешки)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Дворак (US)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Дворак (Норвешки)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Дворак (Шведски)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Дворак (Шведски)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Естонски"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Шпански"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Фински"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Грчки"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Француски"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Француски"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Јерменски (фонетски)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Јерменски (фонетски)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK тастатура"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Грузијски (\"Руски\" распоред)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Грузијски (\"Латинични\" рапоред)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Грчки"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Гујарати"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Гурмуки"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Хрватски"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Мађарски"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Инуктитут"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Јеврејски"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Јеврејски (Фонетски)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Ирански"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Исландски"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Италијански"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Јапански 106 тастера"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Канада"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "UK тастатура"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Корејанска тастатура"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Арапски"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Латино-Амерички"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Лаоски"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Ирански"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Летонски"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Малајски"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Македонски"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Мијанмар (Бурма)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Монголски (ћирилица)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Малтешки (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Малтешки (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Дански"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Норвешки"
+
+#: ../lib/keyboard.pm:266
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Сирија"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Пољски (qwerty распоред)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Пољски (qwertz распоред)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Пољски"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Португалски"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Канадски (Квебек)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Румунски (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Румунски (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Румунски (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Руски"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Руски (Фонетски)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Шведски"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Словеначки"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Словачки (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Словачки (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Дворак (Норвешки)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr " Thai тастатура"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Српски (ћирилица)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Сирија"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Јерменски (фонетски)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Токелау"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Тамилски (ISCII-распоред)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Тамилски (распоред на писаћој машини)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr " Thai тастатура"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr " Thai тастатура"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr " Thai тастатура"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Таџикистанска тастатура"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Немачки"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Турски (модерни \"Q\" модел)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Турски (модерни \"Q\" модел)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Украјински"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Сирија"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US тастатура"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US тастатура (интернационална)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US тастатура (интернационална)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Српски (ћирилица)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Вијетнамски  \"number row\"QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Српски (латиница)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Десни Alt тастер"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Оба Shift тастера истовремено"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control и  Shift тастери истовремено"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock тастер"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, fuzzy, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Ctrl и Alt тастери истовремено"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl и Alt тастери истовремено"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt и Shift тастери истовремено"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Мени\" тастер"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Леви \"Windows\" тастер"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Десни \"Windows\" тастер"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, fuzzy, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Оба Shift тастера истовремено"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, fuzzy, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Оба Shift тастера истовремено"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, fuzzy, c-format
 msgid "Left Shift key"
 msgstr "Леви \"Windows\" тастер"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, fuzzy, c-format
 msgid "Right Shift key"
 msgstr "Десни Alt тастер"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, fuzzy, c-format
 msgid "Left Alt key"
 msgstr "Десни Alt тастер"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, fuzzy, c-format
 msgid "Left Control key"
 msgstr "Удаљена контрола"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, fuzzy, c-format
 msgid "Right Control key"
 msgstr "Десни Alt тастер"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1461,12 +1443,12 @@ msgstr ""
 "дозволити измену распореда тастатура\n"
 "(нпр: latin и non latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1474,202 +1456,187 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun Миш"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Стандардни"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Генерички PS2 миш са точкићем"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 тастер"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Генерички 2 тастера миш"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, fuzzy, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Генерички 3 тастера миш"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Точкић"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "серијски"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Генерички 3 тастера миш"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, fuzzy, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC серија (серијски)"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, fuzzy, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC серија (серијски)"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM серија"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech mouse (серијски, стари C7 тип)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, fuzzy, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech mouse (серијски, стари C7 тип)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, fuzzy, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "bus миш"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 тастера"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 тастера"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, fuzzy, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Емулација тастера"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Универзални"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Разно"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ниједан"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Нема миша"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
@@ -1677,57 +1644,42 @@ msgstr ""
 # #,
 # msgid "Confirmation"
 # msgstr "Потврда"
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Изаберите тип миша."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "упуство"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Да имитирам рад 3 тастера?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Порт за миша"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Изаберите на који серијски порт је ваш миш прикључен."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Емулација тастера"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Емулација 2 тастера"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Емулација 3 тастера"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Молим Вас да тестирате миша"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Да би могли да активирате миша"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "померите точкић !"
@@ -1791,6 +1743,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Дворак"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Француски"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Пољски"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Јерменски (стари)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Арапски"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr " Thai тастатура"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun Миш"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Разно"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Емулација тастера"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Емулација 2 тастера"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Емулација 3 тастера"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Турски (традиционални \"F\" модел)"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 1f26f2b..0193c38 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2004-09-15 13:34+0200\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -61,22 +61,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB ili više"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Izaberite X server"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-head konfiguracija"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -85,12 +85,12 @@ msgstr ""
 "Vaš sistem podržava multiple head konfiguraciju.\n"
 "Šta želite da uradite?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Količina memorije na grafičkoj kartici"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -98,82 +98,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Podesi sve glave nezavisno"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Koristi Xinerama ekstenziju"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Podesi samo karticu \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Izbor po želji"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Konfiguracija Internet konekcije"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Kraj"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafička kartica"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Rezolucija"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Opcije"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Priključci"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -186,32 +186,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Izaberite monitor"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Izaberite monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generic"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Proizvođač"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -232,22 +232,22 @@ msgstr ""
 "VEOMA JE VAŽNO da ne navedete tip monitora koji ima ovaj opseg veći nego\n"
 "što ga ima vaš monitor. Ako niste sigurni, odaberite manje vrednosti."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horizontalna frekvencija"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikalna frekvencija"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Izaberite akciju"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -262,7 +262,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -275,83 +275,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 boja (8-bitna paleta)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 hiljade boja (15-bitna paleta)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 hiljada boja (16-bitna paleta)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miliona boja (24-bitna paleta)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Prepoznaj po nastavku"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Rezolucija"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Drugo"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Izaberite rezoluciju i broj boja pri prikazu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafička kartica: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "U redu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Poništi"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Pomoć"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Testiranje konfiguracije"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Da li hoćete da testirate konfiguraciju?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Upozorenje: testiranje ove grafičke kartice može blokirati vaš računar"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -362,159 +362,164 @@ msgstr ""
 "%s\n"
 "Pokušajte da promenite neke od parametara"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Izlazim za %d sekundi"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Da li je ovo ispravno podešeno?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "nijedan"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "yes"
 msgstr "Da"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tip tastature: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tip tastature: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Tip miša: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor - horizontalna frekvencija: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor - vertikalno osvežavanje: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafička kartica: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memorija na grafičkoj kartici: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Broj boja: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Rezolucija: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg drajver: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg konfiguracija"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, fuzzy, c-format
 msgid "Global options"
 msgstr "Opcije modula:"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Grafička kartica: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "X okruženje na startu"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Ja mogu podesti vaš računar da automatski podiže X okruženje pri startanju.\n"
 "Da li želite X okruženje pri restartu ?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -535,922 +540,899 @@ msgstr ""
 "\n"
 "Da li imate ovu opciju?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Kakav sistem vaš TV koristi?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Češki (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Nemački"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Španski"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finski"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Francuski"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK tastatura"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norveški"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Poljski"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Ruski"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Švedski"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US tastatura"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanski"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Jermenski (stari)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Jermenski (typewriter)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Jermenski (fonetski)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arapski"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Estonski"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbejdzan  (latinica)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgijski"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalski (\"Inscript\" raspored)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalski (\"Probhat\" raspored)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bugarski (fonetski)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bugarski (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazilski (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosanski"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Bosanski"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Beloruski"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Švajcarski (Nemački raspored)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Švajcarski (Francuski  raspored)"
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Arapski"
+"Czech (QWERTZ)"
+msgstr "Češki (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Češki (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Nemački"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Nemački (bez mrtvih tastera)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagri"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danski"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Norveški)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Norveški)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norveški)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Švedski)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Švedski)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonski"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Španski"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finski"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Grčki"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Francuski"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Francuski"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Jermenski (fonetski)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Jermenski (fonetski)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK tastatura"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gruzijski (\"Ruski\" raspored)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gruzijski (\"Latinični\" rapored)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grčki"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmuki"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Hrvatski"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Mađarski"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Jevrejski"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Jevrejski (Fonetski)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranski"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandski"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italijanski"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japanski 106 tastera"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kanada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "UK tastatura"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korejanska tastatura"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Arapski"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latino-Američki"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laoski"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Iranski"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Letonski"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malajski"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonski"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Mijanmar (Burma)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolski (ćirilica)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Malteški (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Malteški (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Danski"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norveški"
+
+#: ../lib/keyboard.pm:266
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Sirija"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Poljski (qwerty raspored)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Poljski (qwertz raspored)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Poljski"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugalski"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadski (Kvebek)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumunski (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumunski (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumunski (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Ruski"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Ruski (Fonetski)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Švedski"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovenački"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovački (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovački (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Dvorak (Norveški)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr " Thai tastatura"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Srpski (ćirilica)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Sirija"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Jermenski (fonetski)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Tokelau"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamilski (ISCII-raspored)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamilski (raspored na pisaćoj mašini)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr " Thai tastatura"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr " Thai tastatura"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr " Thai tastatura"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadžikistanska tastatura"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Nemački"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turski (moderni \"Q\" model)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turski (moderni \"Q\" model)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrajinski"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Sirija"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US tastatura"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US tastatura (internacionalna)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US tastatura (internacionalna)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Srpski (ćirilica)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vijetnamski  \"number row\"QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Srpski (latinica)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Desni Alt taster"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Oba Shift tastera istovremeno"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control i  Shift tasteri istovremeno"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock taster"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, fuzzy, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Ctrl i Alt tasteri istovremeno"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl i Alt tasteri istovremeno"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt i Shift tasteri istovremeno"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Meni\" taster"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Levi \"Windows\" taster"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Desni \"Windows\" taster"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, fuzzy, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Oba Shift tastera istovremeno"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, fuzzy, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Oba Shift tastera istovremeno"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, fuzzy, c-format
 msgid "Left Shift key"
 msgstr "Levi \"Windows\" taster"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, fuzzy, c-format
 msgid "Right Shift key"
 msgstr "Desni Alt taster"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, fuzzy, c-format
 msgid "Left Alt key"
 msgstr "Desni Alt taster"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, fuzzy, c-format
 msgid "Left Control key"
 msgstr "Udaljena kontrola"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, fuzzy, c-format
 msgid "Right Control key"
 msgstr "Desni Alt taster"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1461,12 +1443,12 @@ msgstr ""
 "dozvoliti izmenu rasporeda tastatura\n"
 "(npr: latin i non latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1474,202 +1456,187 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun Miš"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standardni"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Generički PS2 miš sa točkićem"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 taster"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Generički 2 tastera miš"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, fuzzy, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Generički 3 tastera miš"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Točkić"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serijski"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Generički 3 tastera miš"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, fuzzy, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC serija (serijski)"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, fuzzy, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC serija (serijski)"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM serija"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech mouse (serijski, stari C7 tip)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, fuzzy, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech mouse (serijski, stari C7 tip)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, fuzzy, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "bus miš"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 tastera"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 tastera"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, fuzzy, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Emulacija tastera"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Univerzalni"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Razno"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "nijedan"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Nema miša"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
@@ -1677,57 +1644,42 @@ msgstr ""
 # #,
 # msgid "Confirmation"
 # msgstr "Potvrda"
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Izaberite tip miša."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "upustvo"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Da imitiram rad 3 tastera?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Port za miša"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Izaberite na koji serijski port je vaš miš priključen."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulacija tastera"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulacija 2 tastera"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulacija 3 tastera"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Molim Vas da testirate miša"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Da bi mogli da aktivirate miša"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "pomerite točkić !"
@@ -1791,6 +1743,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Francuski"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Poljski"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Jermenski (stari)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Arapski"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr " Thai tastatura"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun Miš"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Razno"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulacija tastera"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulacija 2 tastera"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulacija 3 tastera"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Turski (tradicionalni \"F\" model)"
 
diff --git a/po/sv.po b/po/sv.po
index ec0d24b..15bdcd8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-06-22 11:35+0000\n"
 "Last-Translator: Michael Eklund <willard@null.net>\n"
 "Language-Team: Swedish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -72,22 +72,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB eller mer"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X-server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Välj en X-server"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Anpassa \"multi-head\" (flera skärmar) "
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -96,12 +96,12 @@ msgstr ""
 "Systemet stödjer flerskärmskonfiguration.s\n"
 "Vad vill du göra?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Välj minnesstorlek på grafikkortet"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -112,7 +112,7 @@ msgstr ""
 "stöda tilläggsfuntioner.\n"
 "Vill du använda den?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -121,75 +121,75 @@ msgstr ""
 "Den proprietära drivrutinen installerades inte korrekt, växlar till fria "
 "drivrutinen."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Anpassa alla skärmar separat"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Använd Xinerama-utökning"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Konfigurera endast kort \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Anpassad"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Grafikkort & Skärm Konfiguration"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Avsluta"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafikkort"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Bildskärm"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Upplösning"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Testa"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Alternativ"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Insticksprogram"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Din Xorg konfigurationsfil är felaktig, vi kommer att ignorera den."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -202,32 +202,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Välj en monitor för skärm # %d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Välj bildskärm"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Allmänna"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Tillverkare"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -250,22 +250,22 @@ msgstr ""
 "utanför kapaciteten för bildskärmen; du kan då förstöra skärmen.\n"
 "Välj konservativa värden om du är osäker."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horisontell uppdateringsfrekvens"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikal uppdateringsfrekvens"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Välj insticksprogram"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -291,7 +291,7 @@ msgstr ""
 "grafiska servern\" under hårdvara i Mageias kontrollcentral och välja ditt "
 "grafikkort där."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -311,83 +311,83 @@ msgstr ""
 "sektionsarkiven 'nonfree' under \"Installera & ta bort program\", och "
 "installera paketet manuellt, eller konfigurera om ditt grafikkort."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 färger (8 bitar)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 tusen färger (15 bitar)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 tusen färger (16 bitar)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miljoner färger (24 bitar)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatisk"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Upplösningar"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Annan"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Välj upplösning och färgdjup"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafikkort: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Hjälp"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Test av konfigurationen"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Vill du prova konfigurationen?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Varning: att testa det här grafikkortet kan låsa datorn"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -398,159 +398,164 @@ msgstr ""
 "%s\n"
 "Försök att ändra några parametrar"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Avslutar om %d sekunder"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Är detta korrekt inställning?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Inaktivera Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "nej"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "ja"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D hårdvaruacceleration: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tangentbordslayout: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tangentbordslayout: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Mustyp: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Bildskärm: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Bildskärm horisynk: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Bildskärm vertuppdatering: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafikkort: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafikminne: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Färgdjup: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Upplösning: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg-drivrutin: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg-konfiguration"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Globala alternativ"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Inaktivera Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Grafikkortsalternativ"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Aktivera Genomskinlighet (Composite tillägg)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Använd Hårdvaruaccelerad muspekare"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Aktivera RENDER Acceleration (detta kan skapa buggar vid visande av text)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Aktivera klonad skärm på extern monitor"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Aktivera klonad skärm på den andra skärmen"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Tvinga skärmläge på DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Aktivera BIOS Snabbtangent för växlande till extern skärm"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 "Använd EXA istället för XAA (bättre prestanda för Render och Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Grafiskt gränssnitt vid start"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Starta det grafiska gränssnittet (xorg) automatiskt när dator startar"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -570,134 +575,47 @@ msgstr ""
 "\n"
 "Har du den här funktionen?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Vad för slags standard använder din tv?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "annat"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Tjeckiskt (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Tyskt"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spanskt"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finskt"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Franskt"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Engelskt (UK)"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norskt"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polskt"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Ryskt"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Svenskt"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Engelskt (US)"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanskt"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armeniskt (gammal)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenskt (typewriter)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armeniskt (fonetiskt)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabiskt"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -706,189 +624,219 @@ msgstr ""
 "_: tangentbord\n"
 "Asturianskt"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgiskt"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengaliskt (\"Inscript\" uppsättning)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengaliskt (\"Probhat\" uppsättning)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgariskt (fonetiskt)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgariskt (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazilianskt (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosniskt"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetanskt"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Vitryskt"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Schweiziskt (Tysk uppsättning)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Schweiziskt (Fransk uppsättning)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee stavelser"
+"Czech (QWERTZ)"
+msgstr "Tjeckiskt (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tjeckiskt (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Tyskt"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Tyskt (Inga döda tangenter)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danskt"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Franskt)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norskt)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polskt)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Svenskt)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estniskt"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spanskt"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finskt"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Färöiskt"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr ""
+"_: keyboard\n"
+"Franska (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -897,303 +845,324 @@ msgstr ""
 "_: keyboard\n"
 "Franska (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr ""
 "_: keyboard\n"
 "Franska (Bepo, endast latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr ""
+"_: keyboard\n"
+"Franska (Bepo, endast latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Engelskt (UK)"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgiskt (\"Rysk\" uppsättning)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgiskt (\"Latinsk\" uppsättning)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grekiskt"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grekiskt (polytoniskt)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Kroatiskt"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungerskt"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irländska"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israeliskt"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israeliskt (Fonetiskt)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranskt"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Isländskt"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italienskt"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japanskt 106 tangenter"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kanada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kyrgyz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Koreanskt"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdiskt (arabisk skrift)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latinamerikanskt"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotian"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litauiskt"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Lettisk"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedoniskt"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmesisk)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongoliskt (kyrillisk)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltese (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltese (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigerisk"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Holländskt"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norskt"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polskt (qwerty-uppsättning)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polskt (qwertz-uppsättning)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugisiskt"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadensiskt"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumänskt (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumänskt (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1202,154 +1171,161 @@ msgstr ""
 "_: keyboard\n"
 "Romänska (enkel)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Ryskt"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Ryskt (Fonetiskt)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Svenskt"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovenskt"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakiskt (qwertz)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakiskt (qwerty)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Norskt)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (svenskt/finskt)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbiskt (kyrillisk)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syriskt"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syriskt (fonetiskt)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII-uppsättning)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (Skrivmaskin-uppsättning)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thailändskt (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thailändskt (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thailändskt (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (Marokkansk uppsättning) (+ latinsk/arabisk)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifnagh (fonetisk) (+latinsk/arabisk)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajik"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmenskt"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1358,7 +1334,7 @@ msgstr ""
 "_: tangentbord\n"
 "Turkiska (\"F\"-modell)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1367,137 +1343,147 @@ msgstr ""
 "_: tangentbord\n"
 "Turkiska (\"Q\"-modell)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainskt"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Engelskt (US)"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Amerikanskt (internationellt)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Amerikanskt (internationellt)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (US tangentbord med 3 nivåer per tangent)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbekiskt (Kyrillisk)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamesisk  \"numerisk rad\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslaviskt (latinsk)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Högra alt-tangenten"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Båda skift-tangenterna nedtryckta samtidigt"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrl och skift nedtryckta samtidigt"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Caps Lock-tangenten"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Skift och CapsLock nedtryckta samtidigt"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl och alt nedtryckta samtidigt"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt och skift nedtryckta samtidigt"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Meny\"-tangenten"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Vänstra \"Windows\"-tangenten"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Högra \"Windows\"-tangenten"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Båda ctrl-tangenterna samtidigt"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Båda Alt-tangenterna nedtryckta samtidigt"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Vänstra \"Skift\"-tangenten"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Höger skift-tangent"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Vänstra alt-tangenten"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Vänstra ctrl-tangenten"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Högra kontroll-tangenten"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1508,12 +1494,12 @@ msgstr ""
 "låter dig skifta mellan olika tangentbordslayouter\n"
 "(dvs latin eller icke-latin)."
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Varning"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1524,257 +1510,227 @@ msgstr ""
 "Under istallationen måste du använda höger Control tangent för att byta "
 "mellan olika tangentbordskonfigurationer."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Mus"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Allmän PS2-hjulmus"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1-knappars"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Allmän 2-knapparsmus"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Allmän 3-knapparsmus med hjulemulering"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Hjul"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seriell"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Allmän 3-knapparsmus"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan med hjulemulering"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series med hjulemulering"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (seriell, gammal C7-typ)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (seriell, gammal C7-typ) med hjulemulering"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse med hjulemulering"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "bussmus"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2-knappars"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3-knappars"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 knappar med hjulemulering"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universell"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Valfri PS/2- eller USB-mus"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Tvinga evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsofts XBOX kontrollenheter"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox mus"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware mus"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ingen"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Ingen mus"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Kontrollerar musen"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Vänligen välj din mustyp."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Musval"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emulera tredje knappen?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Musport"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Välj vilken serieport musen är kopplad till."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Knappemulering"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Knapp 2-emulering"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Knapp 3-emulering"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Testa musen"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "För att aktivera musen,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "SNURRA PÅ HJULET!"
@@ -1836,3 +1792,51 @@ msgstr "Starta Mageias konfigurationsverktyg för grafik"
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 "Autentisering krävs för att starta Mageias konfigurationsverktyg för grafik"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Franskt"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polskt"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armeniskt (gammal)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee stavelser"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Mus"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox mus"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware mus"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Knappemulering"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Knapp 2-emulering"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Knapp 3-emulering"
diff --git a/po/ta.po b/po/ta.po
index 41cedfa..d751acb 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 1.0\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2002-09-06 00:35+0800\n"
 "Last-Translator: prabu anand <prabu_anand2000@yahoo.com>\n"
 "Language-Team: Tamil <tamilinix@yahoogroups.com>\n"
@@ -63,22 +63,22 @@ msgstr "32 MB மெகாபைட்"
 msgid "64 MB or more"
 msgstr "64 MB மெகாபைட் அல்லது அதற்கு அதிகமாக"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X-பரிமாறி"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "X-பரிமாறியைத் தேர்வு செய்"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "பல்திரையக வடிவமைப்பு"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -87,12 +87,12 @@ msgstr ""
 "உங்கள் கணினி அமைப்பு பல்திரையக வடிவமைப்பில் வேலைச் செய்யும்\n"
 "நீங்கள் என்ன செய்ய விரும்புகிறீர்கள்?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "உங்கள் காட்சியமைப்பு அட்ைடயின் நினைவகத்தின் அளவைத் தேர்ந்ெதடுங்கள்"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -100,82 +100,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "அனைத்து திரைகளையும் தனித்தனியாக வடிவமைக்கவும்"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "சினிராமா நீட்டிப்புகளை பயன்படுத்தவும்"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "\"%s\"%s என்ற அட்ைடயை மட்டும்  வடிவமைக்கவும்"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "தனிப்பயனாக்கம்"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "இணையத்ெதாடர்பு  வடிவமைப்பாளன்"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "வெளிச்ெசல்"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "காட்சியமைப்பு அட்ைட"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "திரையகம்"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "பரிமாணங்கள்"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "சோதனை"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "விருப்பத்ேதர்வுகள்"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "செருகல்கள்"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -188,32 +188,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, fuzzy, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "திரையகத்ைத தேர்வுச் செய்"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "திரையகத்ைத தேர்வுச் செய்"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play -1997 க்கு பிறகு வந்த திரையகங்கள் இவ்வகையைச் சேரும்"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "பொது-இன திரையகம்"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "விற்பவர்"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -236,22 +236,22 @@ msgstr ""
 "எப்ேபாதும் சிறிய வீச்சுகளையே தேர்வுச் செய்யுங்கள் \n"
 "தவறான ஒத்தியக்க அளவுகளை தேர்வுச் செய்தால்  திரையகம் முற்றிலும் செயலிழந்து போகலாம்"
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "கிடையான புதுக்கல் வீதம்"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "செங்குத்தான புதுக்கல் வீதம்"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "செருகல்களை பயன்படுத்து"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -266,7 +266,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -279,83 +279,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 வண்ணங்கள் (8 பிட்டுகள்)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32000 வண்ணங்கள் (15 பிட்டுகள்)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65000 வண்ணங்கள் (16 பிட்டுகள்)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 மில்லியன் வண்ணங்கள் (24 பிட்டுகள்)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "தானாக"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "பரிமாணங்கள்"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "மற்றவை"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "உங்களுக்கு விருப்பமான பரிமாணங்களையும், ஆழங்களையும் தேர்ந்ெதடுங்கள்"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "காட்சியமைப்பு அட்ைட: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "சரி"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "தவிர்"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "உதவி"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "வடிவமைப்பு சோதித்து பார்க்கப்படுகிறது"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "உங்கள் வடிவமைப்ைப சோதித்து பார்க்க வேண்டுமா? [சோதித்து பார்ப்பது முக்கியம்]"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "எச்சரிக்ைக; காட்சியமைப்பு அட்ைடயை சோதிப்பது உங்கள் கணினியை முடமாக்கலாம்"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -366,159 +366,164 @@ msgstr ""
 "%s\n"
 "சில அளபுருக்களை மாற்றி பாருங்கள்"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d விநாடிகளில் ெவளிேயறுகிறது"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "இந்த அைமப்பு சரியா?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "ஒன்றுமில்ைல"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "yes"
 msgstr "ஆம்"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "விசைப்பலகையின் இட அமைவு %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "விசைப்பலகையின் இட அமைவு %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "எலியின் வகை: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "திரையகம்: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "திரையகத்தின் கிடையான ஒத்தியக்கம் %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "திரையகத்தின் செங்குத்து ஒத்தியக்கம் %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "காட்சியமைப்பு அட்ைட %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "காட்சியமைப்பு அட்ைடயின் நினைவக அளவு: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "வண்ணங்களின் ஆழம்: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "பரிமாணம்: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "X பரிமாறியின் இயக்கு நிரல் %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "X வடிவமைப்பு"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, fuzzy, c-format
 msgid "Global options"
 msgstr "கூறு அமைப்புகள்"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "காட்சியமைப்பு அட்ைட: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "துவங்கும் போது வரைவியல்வழியில் துவங்குக"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "என்னால் உங்கள் கணினியை துவங்கும் போது வரைவியல்வழியில் துவக்க முடியும்.\n"
 "ஒவ்வொரு முறை கணினி துவங்கும்போதும் X துவங்கட்டுமா?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -539,922 +544,899 @@ msgstr ""
 "\n"
 "நீங்கள் இதனை பயன் படுத்தப் போகிறீர்களா?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "உங்கள் டிவி எந்த செந்தர வரையேட்டின் கீழ் வருகிறது?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "செக்(குவர்டி)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "ெஜர்மன்"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "வோராக்"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "ஸ்பானிஷ்"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "பின்னிஷ்"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "பிரஞ்சு "
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "ஆங்கில விசைப்பலகை"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "நார்ேவ "
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "பொலிஸ்"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "ரஷியன்"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "சுவிடிஷ்"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "அமெரிக்க விசைப்பலகை"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "அல்பேனியன்"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "ஆர்மினியன்(பழைய)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "ஆர்மினியன்(தட்டச்சு)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "ஆர்மினியன்(ஒலியமைப்பு)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr ""
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "எஸ்ேதானியா"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "அசர்பைஜான்"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "பெல்ஜியன்"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "வங்காளம் (Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "வங்காளம் (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "பல்ேகரிய(ஒலியமைப்பு)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "பல்ேகரிய(பிடிஸ)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "பிரேசில்"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "போஸ்னியா"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "போஸ்னியா"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "பேலாருஸ்"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "சுவிஷ்(ெஜர்மன்)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "சுவிஷ்(பிரெஞ்சு)"
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "செர்பிய"
+"Czech (QWERTZ)"
+msgstr "செக்(குவர்டி)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "செக்(குவர்ட்டி)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "ெஜர்மன்"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "ெஜர்மன்(ெடட் விைச இல்லாமல்"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "ேதவநாகரி"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "டச்சு"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "வோரக்(US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "வோரக்(நார்ேவ)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "வோரக்(நார்ேவ)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "வோரக்(US)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "வோரக்(நார்ேவ)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "வோரக்-சுவிடிசு "
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "வோரக்-சுவிடிசு "
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "எஸ்ேதானியா"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "ஸ்பானிஷ்"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "பின்னிஷ்"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "கிரேக்கம் "
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "பிரஞ்சு "
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "பிரஞ்சு "
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "ஆர்மினியன்(ஒலியமைப்பு)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "ஆர்மினியன்(ஒலியமைப்பு)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "ஆங்கில விசைப்பலகை"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "ஜார்ஜியா(\"Russian\" layout)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "ஜார்ஜியா"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "கிரேக்கம் "
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "குஜராத்தி"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr ""
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "குரேசிய "
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "அங்கேரிய "
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr ""
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "இஸ்ரலேிய"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "இஸ்ரலேிய(ஒலியமைப்பு)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "இரானிய"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "ஐஸ்லாந்து "
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "இத்தாலிய "
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "ஜப்பானிய 106 விசை"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "கனடா"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "ஆங்கில விசைப்பலகை"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "கொரிய விசைப்பலகை"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "ஆர்மினியன்(ஒலியமைப்பு)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "லத்தின் அமெரிக்க"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "லாவோஸ்"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "இரானிய"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "லாட்விய"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "மலையாளம்"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "மாசிடோனிய"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "மியான்மார்(பர்மீஸ்)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "மங்ேகாலியன்(சிரிலிக்)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "மால்டீஸ்(UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "மால்டீஸ்(US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "டச்சு"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "நார்ேவ "
+
+#: ../lib/keyboard.pm:266
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "லைபிரியா"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "பொலிஷ்(குவர்ட்டி)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "பொலிஷ்(குவார்ட்ஸ்)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "பொலிஸ்"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "போர்த்துகிசிய"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "கனடிய(Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "ரோமேனிய(குவார்ட்ஸ்)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "ரோமேனிய(குவர்ட்டி)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "ரோமேனிய(குவார்ட்ஸ்)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "ரஷியன்"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "ரஷிய(ஒலியமைப்பு)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "சுவிடிஷ்"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "சுலோவெனிய"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "சுலோவெனிய(குவார்ட்ஸ்)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "சுலோவெனிய(குவர்ட்டி)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "வோரக்(நார்ேவ)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "தாய் விசைப்பலகை"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "செர்பிய"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "தொடர்நிலைத் துறை"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "ஆர்மினியன்(ஒலியமைப்பு)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "பெல்ஜியம்"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "தமிழ்(இஸ்கி) "
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "தமிழ்(தட்டச்சு)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "தாய் விசைப்பலகை"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "தாய் விசைப்பலகை"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "தாய் விசைப்பலகை"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "தாஜிக் விசைப்பலகை"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "ெஜர்மன்"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "புது துருக்கிய "
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "புது துருக்கிய "
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "உக்ேரனிய"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "லைபிரியா"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "அமெரிக்க விசைப்பலகை"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "அமெரிக்க விசைப்பலகை(சர்வதேச)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "அமெரிக்க விசைப்பலகை(சர்வதேச)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "செர்பிய"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "வியட்நாமிய "
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "யுகோஸ்சுலோவிய"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "வலது  Alt விசை"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "இரண்டு Shift விசைகளும் ஒன்றாக"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control  மற்றும் Shift விசைகளும் ஒன்றாக"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock விசை"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, fuzzy, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Ctrl மற்றும் Alt  விசைகளும் ஒன்றாக"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl மற்றும் Alt  விசைகளும் ஒன்றாக"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt மற்றும் Shift விசைகளும் ஒன்றாக"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\" விசை"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "இடது விண்ேடாஸ் விசை"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "வலது விண்ேடாஸ் விசை"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, fuzzy, c-format
 msgid "Both Control keys simultaneously"
 msgstr "இரண்டு Shift விசைகளும் ஒன்றாக"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, fuzzy, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "இரண்டு Shift விசைகளும் ஒன்றாக"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, fuzzy, c-format
 msgid "Left Shift key"
 msgstr "இடது விண்ேடாஸ் விசை"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, fuzzy, c-format
 msgid "Right Shift key"
 msgstr "வலது  Alt விசை"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, fuzzy, c-format
 msgid "Left Alt key"
 msgstr "வலது  Alt விசை"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, fuzzy, c-format
 msgid "Left Control key"
 msgstr "டிரேக்தொலைப்புழங்கி"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, fuzzy, c-format
 msgid "Right Control key"
 msgstr "வலது  Alt விசை"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1465,12 +1447,12 @@ msgstr ""
 "மாற்ற எந்த விசை அல்லது விசை சேர்மானங்களை தேர்வுச் செய்க\n"
 "(உதாரனத்திற்கு தமிழ் மற்றும் ஆங்கிலம்)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "எச்சரிக்ைக"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1478,257 +1460,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "சன்-எலி"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "இயல்பான"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "லாஜிடெக்- Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "பொதுவான PS2 சக்கர எலி"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "கிளைட்பாயின்ட்-GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "கென்ஸிங்க்டன் சிந்திக்கும் எலி-Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "ஜினியஸ் நெட்எலி-Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "ஜினியஸ் நெட்சக்கரஎலி-Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "மைக்ேரசாப்ட் Explorer-மேலோடி"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 பொத்தான்"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "பொதுவான 2 பொத்தான் எலி"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, fuzzy, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "பொதுவான 3 பொத்தான் எலி"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "சக்கரம்"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "தொடர்நிலைத் துறை"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "பொதுவான 3 பொத்தான் எலி"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "மைக்ேரசாப்ட் இன்டெலி"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "லாஜிடெக் எலி-Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, fuzzy, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "லாஜிடெக் எலி-Logitech MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "எலி இயக்கங்கள்"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "லாஜிடெக் CC வகை எலி"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, fuzzy, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "லாஜிடெக் CC வகை எலி"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "லாஜிடெக் MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM வகை"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "லாஜிடெக் எலி(பழைய, C7 வகை)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, fuzzy, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "லாஜிடெக் எலி(பழைய, C7 வகை)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, fuzzy, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "கென்ஸிங்க்டன் சிந்திக்கும் எலி-Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "பஸ்எலி"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 பொத்தான்கள்"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 பொத்தான்கள்"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, fuzzy, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "பொத்தான் போன்மி"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "உலகளாவிய"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "மைக்ேரசாப்ட் Explorer-மேலோடி"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "வேறு"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ஒன்றுமில்ைல"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "எலி ஏதுமில்ைல"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "தயவுசெய்து, உங்கள் எலியின் வகையைத் தேர்வுச் செய்யுங்கள் "
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "மியான்மர்"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "மூன்றாவது பொத்தான் இருப்பதாக கருதுங்கள்?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "எலி இணைக்கப்பட்டுள்ள துறை"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "தயவுசெய்து, உங்கள் எலி இணைக்கப்பட்டுள்ள தொடர்நிலைத் துறைவயைத் தேர்வுச் செய்யுங்கள்"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "பொத்தான் போன்மி"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "2-பொத்தான் போன்மி"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3-பொத்தான் போன்மி"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "தயவுசெய்து, உங்கள் எலியை சோதனை செய்யுங்கள்"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "உங்கள் எலியை செயல்பட வைக்க"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "உங்கள் சக்கரத்ைத உருட்டுங்கள்"
@@ -1792,6 +1744,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "வோராக்"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "பிரஞ்சு "
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "பொலிஸ்"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "ஆர்மினியன்(பழைய)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "செர்பிய"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "தாய் விசைப்பலகை"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "சன்-எலி"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "வேறு"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "பொத்தான் போன்மி"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "2-பொத்தான் போன்மி"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3-பொத்தான் போன்மி"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "துருக்கிய "
 
diff --git a/po/tg.po b/po/tg.po
index fd42c6e..e8bd0a1 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2017-03-20 06:44+0000\n"
 "Last-Translator: Victor Ibragimov <victor.ibragimov@gmail.com>\n"
 "Language-Team: Tajik (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -68,22 +68,22 @@ msgstr "32 МБ"
 msgid "64 MB or more"
 msgstr "64 МБ ё зиёдтар"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Сервери X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Интихоби сервери X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Шакли бисёр-сарлавҳа дор"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -92,12 +92,12 @@ msgstr ""
 "Системаи шумо батанзимдарории бисёр саракҳоро пуштибонӣ мекунад.\n"
 "Чӣ кор кардан мехоҳед?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Ҳаҷми ҳофизаи карти графикии худро интихоб кунед"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -105,82 +105,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Танзимдарории мустақили ҳама сарлавҳаҳо"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Истифодаи пасванди Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Танзимдарории танҳо карти \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Интихобӣ"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Баромадан"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Карти Графикӣ"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Монитор"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Ҳалнокӣ"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Озмун"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Хосиятҳо"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Мутассалкунандаҳо"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Файли батанзимдарории Xorg шикаста аст, мо онро рад мекунем."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -193,32 +193,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Дидабонро барои сараки #%d интихоб кунед"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Мониторро интихоб кунед"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Одатӣ"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Баранда"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -242,22 +242,22 @@ msgstr ""
 "расонида метавонед.\n"
 " Агар дар шубҳа бошед, гузориши кӯҳнаро интихоб кунед."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Суръати навсозии уфуқӣ"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Суръати навсозии амудӣ"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -272,7 +272,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -285,83 +285,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 ранг (8 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 ҳазор ранг (15 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 ҳазор ранг (16 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 миллион ранг (24 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Худкор"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Ҳалнокиҳо"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Дигар"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Ҳалнокӣ ва чуқурии рангро интихоб кунед"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Карти графикӣ: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Бекор кардан"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Кумак"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Санҷиши танзим"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Шумо шаклро санҷидан мехоҳед?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Огоҳӣ: санҷиши ин карто графикӣ компютери шуморо фалач карда метавонад"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -372,157 +372,162 @@ msgstr ""
 "%s\n"
 "Баъзе параметрҳоро иваз кунед"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Баромад дар %d сония"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Ин гузориши дуруст аст?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Ороиши забонак: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Ороиши забонак: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Навъи муш: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Монитор: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Ҳамгомкунии Уфуқии Монитор: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Навсозии Амудии Монитор: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Карти графикӣ: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Ҳофизаи графикӣ: %s кБ\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Чуқурии ранг: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Ҳалнокӣ: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Гардони Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Шоакли Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Интерфейси графикӣ ҳангоми оғозёбӣ"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -544,922 +549,899 @@ msgstr ""
 "\n"
 "Оё шумо ин хусусиятро доред?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Кадом намудро телевизори шумо истифода мебарад?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "дигар"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Чехӣ (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Олмонӣ"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Дворака"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Испанӣ"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Финӣ"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Форонсавӣ"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Забонаки UK"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Норвегӣ"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Полянӣ"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Русӣ"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Шведӣ"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Забонаки америкоӣ"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Албанӣ"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Арманӣ (кӯҳна)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Арманӣ (чопи мошинӣ)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Арманӣ (фонетикӣ)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Арабӣ"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr ""
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Озарбойҷонӣ (лотинӣ)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Белгиягӣ"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Бенгалӣ (Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Бенгалӣ (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Булғорӣ (фонетикӣ)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Булғорӣ (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Бразилягӣ (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Босниягӣ"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr ""
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Беларусӣ"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Швейсарӣ (ороиши олмонӣ)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Швейсарӣ (тарҳбандии фаронсавӣ)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr ""
+"Czech (QWERTZ)"
+msgstr "Чехӣ (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Чехӣ (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Олмонӣ"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Олмонӣ (бе калидҳои мурда)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Девангари"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Даниягӣ"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Дворака (ШМА)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Эсперанто-Ҷаҳонӣ)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr ""
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr ""
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (норвеягӣ)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Дворака (Шведӣ)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Эстонӣ"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Испанӣ"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Финӣ"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr ""
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Форонсавӣ"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr ""
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
-msgstr ""
+"French (Bepo latin9)"
+msgstr "Юнонӣ (polytonic)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Полякӣ (ороиши qwerty)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Забонаки UK"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Гурҷӣ (ҷобаҷогузории \"Русӣ\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Гурҷӣ (\"Лотинӣ\" ороиш)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Юнонӣ"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Юнонӣ (polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Гуҷаратӣ"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Гурмуки"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Хорватиягӣ"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Маҷорӣ"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Ирландӣ"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Инуктитут"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Исроилӣ"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Исроилӣ (фонетикӣ)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Эронӣ"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Исландӣ"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Италиёӣ"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Ҷопонӣ 106 калидҳо"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Каннада"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Забонаки қирғизӣ"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Забонаки куриёгӣ"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr ""
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Амрикои Лотинӣ"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Лаосӣ"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Латвиягӣ"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Малайӣ"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Македонӣ"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Мянмагӣ (Бирма)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Муғулӣ (кириллӣ)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Мальтиягӣ (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Малтиягӣ (ИМА)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Ҳолландӣ"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Норвегӣ"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Ория"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Полякӣ (ороиши qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Полякӣ (ороиши qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr ""
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Португалиягӣ"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Канадиягӣ (Квибек)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Руминӣ (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Руминӣ (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Русӣ"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Русӣ (Фонетикӣ)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Шведӣ"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Словениягӣ"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Словакиягӣ (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Словакиягӣ (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Сиамӣ (норвегӣ)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (шведӣ/финӣ)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr ""
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Сербӣ (кирилӣ)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Суриягӣ"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Суриягӣ (фонетикӣ)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Тамилӣ (ҷобаҷогузории ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Тамилӣ (ҷобаҷогузории мошинаи чопкунӣ)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr ""
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr ""
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr ""
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Забонаки тоҷикӣ"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr ""
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Украинӣ"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr ""
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Забонаки америкоӣ"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Забонаки амрикоӣ (байналхалқӣ)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Забонаки амрикоӣ (байналхалқӣ)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Ӯзбекӣ (кириллӣ)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Ветнамӣ \"қатори рақамдор\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Югославӣ (лотинӣ)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Калиди рости Alt"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Дар як вақт ҳар дуи забонакҳои Shift"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Калиди Control ва Shift дар як вақт"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Калиди CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Калиди Shift ва CapsLock дар як вақт"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Калиди Ctrl ва Alt дар як вақт"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Калидҳои Alt ва Shift ҳамзамон"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Забонаки \"Menu\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Тугмачаи чап \"Windows\""
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Калиди рости \"Windows\""
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Дар як вақт ҳар дуи забонаки Control"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Ҳар дуи дагмаи Alt дар як вақт"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Калиди чапи Shift"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Калиди рости Shift"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Калиди чапи Alt"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Калиди чапи Control"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Дагмаи рости Control"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1470,12 +1452,12 @@ msgstr ""
 "гузаштанро байни ороишҳои гуногуни забонакро медиҳад, интихоб намоед\n"
 "(масалан: лотинӣ ё ин ки ғайри лотинӣ)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Огоҳӣ"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1486,258 +1468,228 @@ msgstr ""
 "Дар ҷараёни коргузорӣ забонаки Control-и Ростро\n"
 "барои амалӣ намудани алоқа байни ороишҳои гуногуги забонак истифода баред."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Муш"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Намунавӣ"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Муши Умумии PS2 бо Ғилдирак"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 тугма"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Муши Стандартӣ бо 2 Тугма"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Муши седагмавии умумӣ бо намунаи ғилдиракча"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Ғилдирак"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "пайдарпай"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Муши нусхавӣ бо 3 дагма"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "IntelliМуши Microsoft"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan бо намунасозии Чарха"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Системаҳои Муш"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series бо намунаи ғилдиракча"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (навбатии намуди кӯҳнаи C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Муши Logitech (беруна, навъи кӯҳнаи C7) бо намунаи ғилдирак"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Муши Kensington Thinking бо намунаи чарх"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 тугма"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 дагма"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Се дагма бо намунаи ғилдиракча"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Ягон PS/2 & USB муш"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr ""
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "мавҷуд нест"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Муш нест"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Лутфан намуди мушатонро интихоб кунед."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr ""
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Дагмаи сеюмро намунасозӣ кардан?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Даргоҳи муш"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr ""
 "Лутфан дар кадом бандари беруна муши шумо пайваст буданашро интихоб кунед."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Намунаи дагмаҳо"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Намунаи дагмаи 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Намунаи тугмачаи сеюм"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Лутфан кори мушро санҷед"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Барои фаъол намудани муш,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ҒИЛДИРАКИ ХУДРО ДАВР ЗАНОНЕД!"
@@ -1795,3 +1747,30 @@ msgstr ""
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Дворака"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Полянӣ"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Арманӣ (кӯҳна)"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Муш"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Намунаи дагмаҳо"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Намунаи дагмаи 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Намунаи тугмачаи сеюм"
diff --git a/po/th.po b/po/th.po
index 4bb7dea..78f6fc3 100644
--- a/po/th.po
+++ b/po/th.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2015-07-26 06:29+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Thai (http://www.transifex.com/projects/p/mageia/language/"
@@ -62,34 +62,34 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB หรือมากกว่า"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X เซิร์ฟเวอร์"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Multi-head configuration"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "เลือกขนาดหน่วยความจำของกราฟฟิคการ์ด"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -97,82 +97,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Configure all heads independently"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Use Xinerama extension"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "แบบปรับแก้ได้ (Customized) "
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "ออก"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "จอภาพ"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "ขนาดจอภาพ"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "ทดสอบ"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "อ็อปชั่น"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "ปลั๊กอิน"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -185,32 +185,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "เลือกจอภาพ"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generic"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "เวนเดอร์"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -231,22 +231,22 @@ msgstr ""
 "ไม่เกินความสามารถของจอภาพ ไม่เช่นนั้นอาจเกิดความเสียหายกับจอภาพได้\n"
 "หากไม่แน่ใจโปรดเลือกเซ็ตอัพแบบมาตรฐาน"
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "อัตราการรีเฟรชตามแนวนอน"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "อัตราการรีเฟรชตามแนวตั้ง"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -261,7 +261,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -274,83 +274,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 สี (8 บิต)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "สามหมื่นสองพันสี (15 บิต)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "หกหมื่นห้าพันสี (16 บิต)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "สิบหกล้านสี (24 บิต)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "อัตโนมัติ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "ความละเอียด"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "อื่นๆ"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "เลือกขนาดจอภาพและความละเอียดสี"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "กราฟฟิคการ์ด: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "ตกลง"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "ความช่วยเหลือ"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "ทดสอบการคอนฟิก"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "คุณต้องการทดสอบการคอนฟิกหรือไม่"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -358,157 +358,162 @@ msgid ""
 "Try to change some parameters"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr ""
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "เลือกชนิดของคีย์บอร์ด: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "เลือกชนิดของคีย์บอร์ด: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "เลือกชนิดของเม้าส์: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "จอภาพ: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "อัตราความถี่กวาดตามแนวนอน: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "อัตราความถี่กวาดตามแนวตั้ง: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "กราฟฟิคการ์ด: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "ขนาดหน่วยความจำของกราฟฟิคการ์ด: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "อความละเอียดสี: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "ความละเอียดของภาพ %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "ไดร์เวอร์ Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "การคอนฟิก Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "ให้เป็นกราฟฟิคเมื่อเริ่มต้น"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -521,922 +526,899 @@ msgid ""
 "Do you have this feature?"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr ""
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "เชคโกสโลวาเกีย (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "เยอรมัน"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "สเปน"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "ฟินแลนด์"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "ฝรั่งเศษ"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "อังกฤษ"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "นอร์เวย์"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "โปแลนด์"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "รัสเซีย"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "สวีเดน"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "อเมริกา"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "อาร์เมเนียน (เก่า)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "อาร์เมเนียน (พิมพ์ดีด)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "อาร์เมเนียน (โฟเนติค)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr ""
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr ""
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "เบลเยี่ยม"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr ""
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr ""
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "บราซิล"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr ""
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr ""
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarusian"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "สวิส (เลย์เอ้าท์ตามเยอรมัน)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "สวิส (เลย์เอ้าท์ตามฝรั่งเศษ)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr ""
+"Czech (QWERTZ)"
+msgstr "เชคโกสโลวาเกีย (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "เชคโกสโลวาเกีย (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "เยอรมัน"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "German (no dead keys)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr ""
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "เดนมาร์ก"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr ""
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr ""
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr ""
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norwegian)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonian"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "สเปน"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "ฟินแลนด์"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr ""
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "ฝรั่งเศษ"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "ฝรั่งเศษ"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "อาร์เมเนียน (โฟเนติค)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "อาร์เมเนียน (โฟเนติค)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "อังกฤษ"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "จอร์เจีย (เลย์เอ้าท์แบบรัสเซีย)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "จอร์เจีย (เลย์เอ้าท์แบบละติน)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "กรีก"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr ""
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr ""
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croatian"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "อังการี"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr ""
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr ""
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "อิสราเอล"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "อิลราเอล (โฟเนติค)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranian"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "ไอซ์แลนด์"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "อิตาลี"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japanese 106 keys"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr ""
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr ""
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korean keyboard"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr ""
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "ละตินอเมริกา"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr ""
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr ""
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr ""
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr ""
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedonian"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr ""
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr ""
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr ""
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "ฮอลแลนด์"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "นอร์เวย์"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr ""
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polish (qwerty layout)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polish (qwertz layout)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr ""
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "โปรตุเกส"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "คานาดา (ควิเบค)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr ""
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr ""
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "คานาดา (ควิเบค)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "รัสเซีย"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "รัสเซีย (โฟเนติค)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "สวีเดน"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "สโลวาเนีย"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "สโลวาเกีย (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "สโลวาเกีย (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr ""
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr ""
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr ""
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr ""
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr ""
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr ""
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr ""
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr ""
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr ""
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr ""
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr ""
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr ""
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "ยูเครน"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr ""
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "อเมริกา"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "คีย์บอร์ดอเมริกัน (นานาชาติ)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "คีย์บอร์ดอเมริกัน (นานาชาติ)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamese \"numeric row\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr ""
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr ""
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr ""
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr ""
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr ""
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr ""
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr ""
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1444,12 +1426,12 @@ msgid ""
 "(eg: latin and non latin)"
 msgstr ""
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "คำเตือน"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1457,257 +1439,227 @@ msgid ""
 "key to switch between the different keyboard layouts."
 msgstr ""
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Mouse"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Generic PS2 Wheel Mouse"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 ปุ่ม"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Generic 2 Button Mouse"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Wheel"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "พอร์ตอนุกรม"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "เม้าส์แบบปกติที่ใช้งานสามปุ่ม"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (พอร์ตอนุกรม, แบบเก่า C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 buttons"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 buttons"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr ""
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr ""
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr ""
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr ""
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "ไม่มี"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "ไม่มีเม้าส์"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr ""
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr ""
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "ต้องการจำลองเม้าส์ปุ่มที่สามด้วยหรือไม่?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "พอร์ตของเม้าส์"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "เม้าส์ของคุณต่อเข้ากับพอร์ตอนุกรมใด"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr ""
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "กรุณาทดสอบเม้าส์"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "เพื่อให้เม้าส์ทำงาน"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "เลื่อนล้อของคุณ"
@@ -1765,3 +1717,26 @@ msgstr ""
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "ฝรั่งเศษ"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "โปแลนด์"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "อาร์เมเนียน (เก่า)"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Mouse"
diff --git a/po/tl.po b/po/tl.po
index 88e9c25..f635f9a 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-tl\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2004-09-15 13:35+0200\n"
 "Last-Translator: Arys P. Deloso <arys@deloso.org>\n"
 "Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -61,22 +61,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB o mahigit"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "\"X server\""
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Pumili ng \"X server\""
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "\"Multi-head configuration\""
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -85,12 +85,12 @@ msgstr ""
 "Ang inyong sistema ay sumusuporta sa \"multiple head\n"
 "configuration\". Ano ang gusto ninyong gawin?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Piliin ang laki ng \"memory\" ng inyong graphics card"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -98,82 +98,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "I-configure isa-isa ang lahat ng mga head"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Gamitin ang \"Xinerama extension\""
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "I-configure lang ang \"card\" \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Custom"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Pagko-configure ng koneksyon"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Quit"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Graphic Card"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Resolution"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Subukan"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Mga option"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Mga Plugin"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr ""
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -186,32 +186,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Pumili ng monitor para sa head #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Pumili ng monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Generic"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Vendor"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -233,22 +233,22 @@ msgstr ""
 "na higit sa kakayahan ng inyong monitor: maari ninyong mapinsala ang inyong\n"
 "monitor. Kung may alinlangan, mamili ng konserbatibong setting."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Horizontal refresh rate"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertical refresh rate"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Pumili ng gagawin"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -263,7 +263,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -276,85 +276,85 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 kulay (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 libong kulay (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 libong kulay (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milyong kulay (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Automatic"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Mga \"resolution\""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Ang iba"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Piliin ang \"resolution\" at dami ng kulay"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "\"Graphics card\": %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Cancel"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Tulong"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Pagsubok ng configuration"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Gusto ninyo bang subukan ang configuration?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Babala:ang pagsubok ng graphic card na ito ay maaring mag-freeze ng computer "
 "ninyo"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -365,152 +365,157 @@ msgstr ""
 "%s\n"
 "Subukang palitan ang ilang mga parameter"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Aalis sa loob ng %d segundo"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Ito ba ang tamang \"setting\"?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "wala"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "yes"
 msgstr "Oo"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Keyboard layout: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Keyboard layout: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Uri ng mouse: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitor HorizSync: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitor VertRefresh: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Graphics card: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Graphics memory: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Color depth: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Resolution: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg driver: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Configuration ng Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, fuzzy, c-format
 msgid "Global options"
 msgstr "Mga option ng module:"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "\"Graphics card\": %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Graphical interface na panimula"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
@@ -518,7 +523,7 @@ msgstr ""
 "interface\" pag-boot.\n"
 "Gusto ninyo bang magsimula ang Xorg kapag kayo ay nag-reboot?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -539,922 +544,899 @@ msgstr ""
 "\n"
 "Mayroon ba kayo ng ganitong katangian?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Anong \"norm\" ang ginagamit ng inyong TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr ""
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Czech (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "German"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Spanish"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Finnish"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "French"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "UK keyboard"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norwegian"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polish"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Russian"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Swedish"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "US keyboard"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanian"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armenian (luma)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenian (typewriter)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenian (phonetic)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabic"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Estonian"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgian"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (Inscript layout)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (Probhat layout)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgarian (phonetic)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgarian (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazilian (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnian"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Bosnian"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarusian"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Swiss (German layout)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Swiss (French layout)"
 
-#: ../lib/keyboard.pm:219
-#, fuzzy, c-format
+#: ../lib/keyboard.pm:205
+#, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Arabic"
+"Czech (QWERTZ)"
+msgstr "Czech (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Czech (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "German"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "German (walang mga dead key)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danish"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Norwegian)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Norwegian)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norwegian)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Swedish)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Swedish)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonian"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Spanish"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Finnish"
+
+#: ../lib/keyboard.pm:221
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Greek"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "French"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "French"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Greek (polytonic)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Greek (polytonic)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "UK keyboard"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgian (\"Russian\" layout)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgian (\"Latin\" layout)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Greek"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Greek (polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croatian"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hungarian"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irish"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israeli"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israeli (Phonetic)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranian"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Icelandic"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italian"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japanese 106 key"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "UK keyboard"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korean keyboard"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Arabic"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latin American"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotian"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Iranian"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latvian"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedonian"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolian (cyrillic)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltese (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltese (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Dutch"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norwegian"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polish (qwerty layout)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polish (qwertz layout)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Polish"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portuguese"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canadian (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romanian (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romanian (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Romanian (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Russian"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Russian (Phonetic)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Swedish"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovenian"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr ""
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakian (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakian (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norwegian)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (swedish/finnish)"
 
-#: ../lib/keyboard.pm:301
-#, fuzzy, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Thai keyboard"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbian (cyrillic)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syriac"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syriac (phonetic)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII-layout)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (Typewriter-layout)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai keyboard"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai keyboard"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai keyboard"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr ""
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajik keyboard"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "German"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turkish (modern \"Q\" model)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turkish (modern \"Q\" model)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainian"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "US keyboard"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "US keyboard (international)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "US keyboard (international)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbek (cyrillic)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamese \"numeric row\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Yugoslavian (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Kanang Alt key"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Parehong Shift key magkasabay"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control at Shift key magkasabay"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock key"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, fuzzy, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Ctrl at Alt key magkasabay"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl at Alt key magkasabay"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt at Shift key magkasabay"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menu\" key"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Kaliwang \"Windows\" key"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Kanang \"Windows\" key"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Parehong Control key magkasabay"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Parehong Alt key magkasabay"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Kaliwang Shift key"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Kanang Shift key"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Kaliwang Alt key"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Kaliwang Control key"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Kanang Control key"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1465,12 +1447,12 @@ msgstr ""
 "magpapahintulot ng paglilipat sa pagitan ng iba't-ibang mga\n"
 "layout ng keyboard (e.g. latin at non latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Babala"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1482,257 +1464,227 @@ msgstr ""
 "Kanang Control key para lumipat sa pagitan ng iba't-ibang\n"
 "mga layout ng keyboard."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Mouse"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standard"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Generic PS2 Wheel Mouse"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 pindutan"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Generic 2 Button Mouse"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Generic 3 Button Mouse na may Wheel kunwari"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Wheel"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serial"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Generic 3 Button Mouse"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan na may Wheel kunwari"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series na may Wheel kunwari"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (serial, lumang C7 na uri)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (serial, lumang C7 na uri) na may Wheel kunwari"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse na may Wheel kunwari"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 pindutan"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 pindutan"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 pindutan na may Wheel kunwari"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Kahit anong PS/2 & USB mouse"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, fuzzy, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Sari-sari"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "wala"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Walang mouse"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Piliin ang inyong uri ng mouse."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "Mano-manong pili"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Magkunwaring may pangatlong pindutan?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Mouse Port"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Piliin kung sa aling serial port nakakabit ang inyong mouse."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Pagkukunwari ng mga pindutan"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Pagkunwari ng ika-2 Pindutan"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Pagkunwari ng ika-3 Pindutan"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Pakisubok ang mouse"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Para paganahin ang mouse,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "GALAWIN ANG INYONG WHEEL!"
@@ -1798,6 +1750,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "French"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polish"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armenian (luma)"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Arabic"
+
+#, fuzzy
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Thai keyboard"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Mouse"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Sari-sari"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Pagkukunwari ng mga pindutan"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Pagkunwari ng ika-2 Pindutan"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Pagkunwari ng ika-3 Pindutan"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Turkish (traditional \"F\" model)"
 
diff --git a/po/tr.po b/po/tr.po
index dff9082..4608eaf 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2017-03-15 13:32+0000\n"
 "Last-Translator: tarakbumba <tarakbumba@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -65,22 +65,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB veya daha fazla"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X sunucusu"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Bir X sunucusu seçiniz"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Çoklu-Kafa yapılandırması"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -89,12 +89,12 @@ msgstr ""
 "Sisteminiz Çoklu-Kafa yapılandırmasını destekliyor.\n"
 "Ne yapılmasını isterdiniz ?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Ekran kartınızın bellek miktarını seçin"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -105,7 +105,7 @@ msgstr ""
 "mevcut.\n"
 "Bunu kullanmak ister misiniz?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -114,75 +114,75 @@ msgstr ""
 "Tescilli sürücü düzgün şekilde kurulamadı, özgür yazılım sürücüsüne "
 "dönülüyor."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Tüm kafaları ayrı ayrı yapılandır"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama eklentisini kullan"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Sadece \"%s\" %s kartı yapılandırılsın"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Kişisel"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Ekran Kartı & Monitör Yapılandırması"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Çık"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Ekran Kartı"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitör"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Çözünürlük"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Dene"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Seçenekler"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Eklentiler"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Xorg yapılandırmanız bozuk, bunu yok sayacağız."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -195,32 +195,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Kafa #%d için monitörünüzü seçin"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Monitörünüzü seçin"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Tak ve Kullan"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Genel"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Üretici"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -239,22 +239,22 @@ msgstr ""
 "yapmamanız oldukça önemlidir, aksi takdirde monitör zarar görebilir.\n"
 "Seçerken bir ikileme düşerseniz, düşük çözünürlükte bir ayar seçin."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Yatay tazeleme hızı"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Dikey tazeleme hızı"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Eklentileri seçin"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -279,7 +279,7 @@ msgstr ""
 "etkinleştirin ve \"Grafiksel sunucu ayarlayın\" bölümünde ekran kartınızı "
 "yeniden seçerek ekran kartı sürücüsünü yeniden ayarlayın."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -300,83 +300,83 @@ msgstr ""
 "Kurun veya Kaldırın\" bölümünde 'nonfree' deposunu etkinleştirin ve ya "
 "donanım yazılımı paketini kurun veya ekran kartınızı yeniden yapılandırın."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 renk (8 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 bin renk (15 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 bin renk (16 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 milyon renk (24 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Çözünürlükler"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Diğer"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Çözünürlüğü ve renk derinliğini belirtin"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Ekran kartı: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Tamam"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "İptal"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Yardım"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Yapılandırmanın denenmesi"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Yapılandırmanızı denemek ister misiniz?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Uyarı: Bu ekran kartı denenirken makineniz kilitlenebilir"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -387,158 +387,163 @@ msgstr ""
 "%s\n"
 "Parametreleri değiştirmeyi deneyin"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d saniye içerisinde çıkılıyor"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Ayarlamalar doğru mu?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Ctrl-Alt-Backspace tuş bileşimini devredışı bırak: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "hayır"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "evet"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3B donanım hızlandırma: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Klavye yerleşimi: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Klavye yerleşimi: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Fare türü: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitör: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitörün Yatay Tazelemesi: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitörün Dikey Tazelemesi: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Ekran kartı: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Ekran kartı belleği: %s KB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Renk derinliği: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Çözünürlük: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg sürücüsü: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg yapılandırması"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Genel seçenekler"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Ctrl-Alt-Backspace tuş bileşimini devredışı bırak"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Ekran kartı seçenekleri"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Yarı Geçirgenliği Etkinleştir (Kurgulama eklentisi)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Donanım hızlandırmalı fare imleci kullan"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Sunum Hızlandırmayı etkinleştir. (metin gösterilirken hatalara yol açabilir)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Bir dış monitörde ikincil görüntülemeyi etkinleştir"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "İkinci ekranda ikincil görüntülemeyi etkinleştir."
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "DVI görüntüleme kipine zorla"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Dış monitöre geçişte BIOS kısayol tuşu etkinleştir"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "XAA yerine EXA kullan (Sunum ve Kurguda daha çok verimlilik)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Başlangıçta grafiksel ara birim"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Başlangıçta otomatik olarak grafiksel ara birimi (Xorg) başlat"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -559,323 +564,266 @@ msgstr ""
 "\n"
 "Kartınızda bu özellik var mı?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "TV kartınız hangi normda ?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "diğer"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Çekçe (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Almanca"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak dili"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "İspanyolca"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Fince"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Fransızca"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "İngiliz (UK) klavye"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norveççe"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Lehçe"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Rusça"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "İsveççe"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Amerikan (US) klavye"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Arnavutça"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Ermenice (eski)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Ermenice (daktilo)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Ermenice (fonetik)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arapça"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Asturyasça"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerice (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Felemenkçe (Belçika)"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalce (İnscript klavyesi)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalce (Probhat klavyesi)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgarca (fonetik)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgarca (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brezilya dili (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Boşnakça"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongka/Tibetçe"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarusça"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "İsveççe (Alman klavyesi)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "İsveççe (Fransız klavyesi)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Çeroke silabikleri"
+"Czech (QWERTZ)"
+msgstr "Çekçe (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Çekçe (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Almanca"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Almanca (ölü tuşlar yok)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danimarkaca"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvoryak dili (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvoryak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvoryak (Fransızca)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvoryak dili (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvoryak (Norveççe)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvoryak dili (Lehçe)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvoryak dili (İsveçce)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonca"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "İspanyolca"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Fince"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faorece"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr ""
+"_: keyboard\n"
+"Fransızca (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -884,303 +832,324 @@ msgstr ""
 "_: keyboard\n"
 "Fransızca (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr ""
 "_: keyboard\n"
 "Fransızca (Bepo, only latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr ""
+"_: keyboard\n"
+"Fransızca (Bepo, only latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "İngiliz (UK) klavye"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gürcüce (\"Rus\" klavyesi)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gürcü dili (\"Latin\" klavye)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Yunanca"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Yunanca (politonik)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Güceratça"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Hırvatça"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Macarca"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "İrlandaca"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Eskimo dili"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "İbranice"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "İbranice (Fonetik)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Farsça"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "İzlandaca"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "İtalyanca"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Japonca 106 tuş"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kanada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kırgız Türkçesi"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Kore klavyesi"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kürtçe (Arapça)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latin Amerika dili"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laos dili"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litvanca"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latviya dili"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedonya dili"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burmaca)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Moğolca (kiril)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltaca (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltaca (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nijerya"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Felemenkçe (Hollanda)"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norveççe"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Lehçe (QWERTY klavye)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Lehçe (QWERTZ klavye)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Peştuca"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portekizce"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Fransızca (Kanada/Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romence (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romence (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1189,298 +1158,315 @@ msgstr ""
 "_: keyboard\n"
 "Romence (temel)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Rusça"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Rusça (Fonetik)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "İsveççe"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovence"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakça (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakça (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norwegian)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (swedish/finnish)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sind klavye"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Sırpça (kril)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Süryanice"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Süryanice (fonetik)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII-planı)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (daktilo-planı)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thai klavye (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thai klavye (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thai klavye (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinak (fas düzeni) (+latin/arapça)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinak (fonetik) (+latin/arapça)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tacik klavye"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Türkmen Türkçesi"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Türkçe (\"F\" klavye)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Türkçe (\"Q\" klavye)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrayna dili"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urduca klavye"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Amerikan (US) klavye"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Amerikan (US) klavye (uluslararası)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Amerikan (US) klavye (uluslararası)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3  (Tuş başına 3 seviyeli US klavye)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Özbek Türkçesi (kril)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamca \"numerik satır\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Yugoslavca (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "AltGr tuşu"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "İki shift tuşu birlikte"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Cntrl ve shift tuşları birlikte"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock tuşu"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "CapsLock ve Shift tuşları birlikte"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl ve Alt tuşları birlikte"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt ve Shift tuşları birlikte"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menü\" tuşu"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Sol \"Windows\" tuşu"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Sağ \"Windows\" tuşu"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "İki Kontrol tuşu birlikte"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "İki Alt tuşu birlikte"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Sol Shift tuşu"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Sağ Shift tuşu"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Sol Alt tuşu"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Sol Kontol tuşu"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Sağ Kontrol tuşu"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1491,12 +1477,12 @@ msgstr ""
 "tuş bileşimini burada seçebilirsiniz.\n"
 "(örn: Türkçe ile İngilizce arasında)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Uyarı"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1507,257 +1493,227 @@ msgstr ""
 "Kurulum sırasında, çeşitli klavye düzenleri arasında geçiş\n"
 "yapabilmek için Sağ Kontrol tuşunu kullanabilirsiniz."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - Fare"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Standart"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Sıradan Tekerli PS2 Fare"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 tuşlu"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Sıradan 2 Tuşlu Fare"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Tekerlek Öykünmeli Genel 3 tuşlu Fare"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Tekerli"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "seri"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Sıradan 3 Tuşlu Fare"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Tekerlek öykünmeli Logitech MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Tekerlek öykünmeli Logitech CC Serisi"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Fare (seri, eski C7 türü)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Tekerlek öykünmeli Logitech Fare (seri, eski C7 türü)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Tekerlek öykünmeli Kensington Thinking Fare"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "bus fare"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 tuşlu"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 tuşlu"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Tekerlek Öykünmeli 3 tuş"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Evrensel"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Herhangi PS/2 & USB fare"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "evdev zorla"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Virtualbox faresi"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware fare"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "hiçbiri"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Fare yok"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Fare deneniyor"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Lütfen kullandığınız farenin türünü seçin."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Fare seçimi"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Üçüncü tuş öykünümü?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Fare Portu"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Farenizin bağlı olduğu seri portu seçiniz."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Tuş öykünmesi"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "2. Tuş Öykünmesi"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "3. Tuş Öykünmesi"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Lütfen farenizi deneyin"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Fareyi etkinleştirmek için,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "FARENİZİN TEKERİNİ HAREKET ETTİRİN!"
@@ -1817,3 +1773,51 @@ msgstr "Mageia Ekran Kartı Yapılandırması Çalıştır"
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 "Mageia Ekran Kartı Yapılandırmasını çalıştırmak için kimlik doğrulama gerekli"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak dili"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Fransızca"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Lehçe"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Ermenice (eski)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Çeroke silabikleri"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sind klavye"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - Fare"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Virtualbox faresi"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware fare"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Tuş öykünmesi"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "2. Tuş Öykünmesi"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "3. Tuş Öykünmesi"
diff --git a/po/uk.po b/po/uk.po
index 6f776db..b6c4663 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-06-15 18:24+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -68,22 +68,22 @@ msgstr "32 МБ"
 msgid "64 MB or more"
 msgstr "64 МБ чи більше"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X сервер"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Виберіть X сервер"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Конфігурація з багатьма головками"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -92,12 +92,12 @@ msgstr ""
 "Ваша система підтримує налаштування багатосекційної головки.\n"
 "Що хочете зробити?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Виберіть розмір пам'яті графічної плати"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -108,7 +108,7 @@ msgstr ""
 "можливості.\n"
 "Чи хочете його використовувати?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -117,75 +117,75 @@ msgstr ""
 "Драйвер виробника не було встановлено, використовується вільно розроблений "
 "драйвер."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Сконфігурувати всі головки незалежно"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Користуватися розширенням Xinerama"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Налаштувати тільки плату \"%s\" %s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Спеціальний"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Налаштування графічної карти і монітора"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Вийти"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Графічна карта"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Монітор"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Роздільна здатність"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Перевірити"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Параметри"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Втулки"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Файл налаштувань Xorg пошкоджено, не братимемо його до уваги."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -198,32 +198,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Виберіть монітор для головки #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Виберіть монітор"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Загальний"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Виробник"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -248,22 +248,22 @@ msgstr ""
 "Якщо маєте сумніви щодо характеристик свого монітора, виберіть\n"
 "гірший монітор."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Частота горизонтальної розгортки"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Частота вертикальної розгортки"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Виберіть втулки"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -292,7 +292,7 @@ msgstr ""
 "допомогою пункту «Налаштувати графічний сервер» у Центрі керування Mageia "
 "(повторно виберіть пункт встановленої у вашій системі графічної картки)."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -314,85 +314,85 @@ msgstr ""
 "програми» і встановіть пакунок з мікропрограмою (firmware) вручну або "
 "виконайте повторну процедуру налаштування вашої графічної картки."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "265 кольорів (8 біт)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 тисячі кольорів (15 біт)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 тисяч кольорів (16 біт)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 мільйонів кольорів (24 біти)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Роздільні здатності"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Інші"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Виберіть роздільну здатність та кількість кольорів"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Відеоплата: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Гаразд"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Довідка"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Тестування конфігурації"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Чи хочете випробувати нову конфігурацію?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Попередження: тестування цієї графічної карти може призвести до зависання "
 "комп'ютера"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -403,161 +403,166 @@ msgstr ""
 "%s\n"
 "Спробуйте змінити деякі параметри"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Залишається %d секунд"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Це правильні установки?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Вимикання Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "ні"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "так"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Апаратне 3D-прискорення: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Розкладка клавіатури: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Розкладка клавіатури: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Тип миші: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Монітор: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Горизонтальна синхронізація монітора: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Частота вертикальної розгортки монітора: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Графічна плата: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Відеопам'ять: %s кБ\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Глибина кольору: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Роздільна здатність: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg драйвер: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Налаштування Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Загальні параметри"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Вимикання Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Параметри графічної плати"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Увімкнути напівпрозорість (розширення Composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Використовувати вказівник миші з апаратним прискоренням"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Увімкнути прискорення зображення (може призвести до помилок відображення "
 "тексту)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Увімкнути резервний дисплей на додатковому моніторі"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Увімкнути резервний дисплей на другому моніторі"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Примусово встановити режим дисплею в DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Увімкнути гарячу клавішу для перемикання резервного монітора"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 "Використовувати EXA на відміну від XAA (краща продуктивність для Render і "
 "Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Графічний інтерфейс при завантаженні"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Автоматично стартувати графічну оболонку (Xorg) при завантаженні"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -578,922 +583,899 @@ msgstr ""
 "\n"
 "У Вас є така можливість?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Який формат використовує ваш телевізор?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "інше"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Чеська (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Німецька"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Дворака"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Іспанська"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Фінська"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Французька"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Британська клавіатура"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Норвезька"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Польська"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Російська"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Шведська"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Клавіатура США"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Албанська"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Вірменська (стара)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Вірменська (друкарська машинка)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Вірменська (фонетична)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Арабська"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Астурійська"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Азербайджанська (латина)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Бельгійська"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Бенгальська (Inscript-layout)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Бенгальська (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Болгарська (фонетична)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Болгарська (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Бразилійська (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Боснійська"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Джонха/Тібетська"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Білоруська"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Швейцарська (німецька розкладка)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Швейцарська (французька розкладка)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Чеська (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Чеська (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Німецька"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Німецька (без мертвих клавіш)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Деванагарі"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Данська"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Дворака (США)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Дворака (Есперанто)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Дворака (Французька)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Дворака (Велика Британія)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Дворака (Норвезька)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Дворака (Польська)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Дворака (Шведська)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Естонська"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Іспанська"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Фінська"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Фарерська"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Французька (Bépo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Французька (Bépo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Французька (Bépo, лише latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Французька (Bépo, лише latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Британська клавіатура"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Грузинська (російська розкладка)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Грузинська (латинська розкладка)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Грецька"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Грецька (політонічна)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Ґуджараті"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Ґурмухі"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Хорватська"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Угорська"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Ірландська"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Ізраїльська"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Ізраїльська (фонетична)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Іранська"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Ісландська"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Італійська"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Японська 106 клавіш"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Каннада"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Киргизька"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Корейська"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Курдська (арабське письмо)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Латиноамериканська"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Лаоська"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Литовська"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Латвійська"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Малайська"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Маорійська"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Македонська"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "М’янмська (Бірманська)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Монгольська (кирилиця)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Мальтійська (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Мальтійська (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Нігерійська"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Голландська"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Норвезька"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Орія"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Польська (розкладка qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Польська (розкладка qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Пушту"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Португальська"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Канадська (Квебек)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Румунська (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Румунська (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Румунська (базова)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Російська"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Російська (фонетична)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Шведська"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Словенська"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Сінгальська"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Словацька (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Словацька (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Саамі (норвезька)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (шведська/фінська)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Сіндійська"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Сербська (кирилиця)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Сирійська"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Сирійська (фонетична)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Телуґу"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Тамільська (розкладка ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Тамільська (машинописна розкладка)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Тайська (Кедмані)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Тайська (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Тайська (Патачот)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Тіфінаг (марокканська розкладка) (+латина/арабська)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Тіфінаг (фонетична) (+латина/арабська)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Таджицька"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Туркменська"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Турецька («F»-модель)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Турецька («Q»-модель)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Українська"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Урду"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Клавіатура США"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Клавіатура США (міжнародна)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Клавіатура США (міжнародна)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (клавіатура US з 3 рівнями на клавішу)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Узбецька (кирилиця)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "В'єтнамська \"цифровий ряд\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Югославська (латинська)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Права клавіша Alt"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Обидві клавіші Shift одночасно"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Клавіші Control і Shift одночасно"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Клавіша CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Клавіші Shift і CapsLock одночасно"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Клавіші Ctrl і Alt одночасно"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Клавіші Alt і Shift одночасно"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Клавіша \"Меню\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Ліва клавіша \"Windows\""
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Права клавіша \"Windows\""
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Обидві клавіші Control одночасно"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Обидві клавіші Alt одночасно"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Ліва клавіша Shift"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Права клавіша Shift"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Ліва клавіша Alt"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Ліва клавіша Control"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Права клавіша Control"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1503,12 +1485,12 @@ msgstr ""
 "Тут Ви можете вибрати клавішу або комбінацію клавіш, якими будете\n"
 "перемикати різні розкладки клавіатури (наприклад, англійську і українську)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Попередження"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1519,257 +1501,227 @@ msgstr ""
 "Під час встановлення потрібно буде використовувати праву\n"
 "клавішу Control для перемикання між різними розкладками клавіатури."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Миша Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Стандартна"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Звичайна миша PS2 з коліщатком"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 кнопка"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Звичайна 2-х кнопкова миша"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Звичайна 3х кнопкова миша з емуляцією коліщатка"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Коліщатко"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "послідовний"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Звичайна 3х кнопкова миша"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan з емуляцією коліщатка"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Серія Logitech CC"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Типу Logitech CC з емуляцією коліщатка"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "Серія MM"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Миша Logitech (послідовна, старий тип C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (serial, тип C7) з емуляцією коліщатка"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse з емуляцією коліщатка"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "Дві кнопки"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "Трьох кнопкова"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 кнопки з емуляцією коліщатка"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Універсальна"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Будь-яка миша PS/2 чи USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Задіяти evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Миша VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "миша VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "нічого"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Немає миші"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Тестування миші"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Будь ласка, вкажіть тип миші."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Вибір миші"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Емулювати третю кнопку?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Порт миші"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Виберіть, до якого послідовного порту під'єднано мишу?"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Емуляція кнопок"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Емуляція 2 клавіш"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Емуляція 3-ї кнопки"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Випробуйте мишу, будь ласка"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Щоб активізувати мишу, "
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ПОКРУТІТЬ КОЛІЩАТКО!"
@@ -1835,6 +1787,54 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Дворака"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Французька"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Польська"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Вірменська (стара)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Сіндійська"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Миша Sun"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Миша VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "миша VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Емуляція кнопок"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Емуляція 2 клавіш"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Емуляція 3-ї кнопки"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Турецька (традиційна \"F\" модель)"
 
diff --git a/po/uz.po b/po/uz.po
index 0ecf241..3ab5496 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11-uz\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2009-12-22 21:22+0500\n"
 "Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -64,22 +64,22 @@ msgstr "32 Mb"
 msgid "64 MB or more"
 msgstr "64 Mb yoki koʻproq"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X serveri"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Grafik kartani tanlash"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Bir necha yadroni sozlash"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -88,12 +88,12 @@ msgstr ""
 "Tizimingiz bir necha yadroni qoʻllay olada.\n"
 "Nima qilishni istaysiz?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Grafik kartangizni xotirasining hajmini tanlang"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -104,7 +104,7 @@ msgstr ""
 "kartaning qoʻshimcha imkoniyatlaridan foydalansa boʻladi.\n"
 "Undan foydalanishni istaysizmi?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -113,75 +113,75 @@ msgstr ""
 "Proprietar drayver toʻgʻri oʻrnatilmagan, ochiq kodli daryverdan "
 "foydalaniladi."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Barcha yadrolarni alohida-alohida sozlash"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama kengaytmasidan foydalanish"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Faqat \"%s\"%s kartasini moslash"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Boshqa"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Grafik karta va monitorni moslash"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Chiqish"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Grafik karta"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Oʻlcham"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Sinash"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Parametrlar"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Plaginlar"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Sizning Xorg faylingiz xato, unga eʼtibor berilmaydi."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -194,32 +194,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "#%d yadro uchun monitorni tanlang"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Monitorni tanlash"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Andoza"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Ishlab chiqaruvchi"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -234,22 +234,22 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Gorizontal yargilash chastotasi"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Vertikal yangilash chastotasi"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Plaginlarni tanlang"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -264,7 +264,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -277,85 +277,85 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 rang (8 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 mingta rang (15 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 mingta rang (16 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 millionta rang (24 bit)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Avtomatik"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Oʻlchamlar"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Boshqa"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Oʻlcham va rang chuqurligini tanlash"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Grafik karta: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Yordam"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Moslamalarni sinab koʻrish"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Moslamalarni sinab koʻrishni istaysizmi?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Diqqat: bu grafik kartani sinab koʻrish kompyuterni qotib qolishiga olib "
 "kelishi mumkin"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -366,158 +366,163 @@ msgstr ""
 "%s\n"
 "Baʼzi bir parametrlarni oʻzgartirib sinab koʻring"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d soniyadan keyin yopiladi"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Bu toʻgʻrimi?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Ctrl-Alt-Backspace ni oʻchirish: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "yoʻq"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "ha"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D tezlashtirish: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tugmalar tartibi: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tugmalar tartibi: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Sichqonchaning turi: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Monitorning HorizSync: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Monitorning VertRefresh: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Grafik karta: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Grafik xotiraning hajmi: %s Kb\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Rang chuqurligi: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Oʻlchami: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg drayveri: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg moslamasi"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Umumiy parametrlar"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Ctrl-Alt-Backspace ni oʻchirish"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Grafik karta moslamalari"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Shaffoflik imkoniyatidan foydalanish (Composite kengaytmasi)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Sichqoncha koʻrsatgichi uchun uskuna akseleratoridan foydalanish"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Render imkoniyatidan foydalanish (matnni koʻrsatishda xato boʻlishi mumkin)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Ekranni tashqi monotorda ayni nusxasini koʻrsatish"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Ikkinchi displeyda ayni shu displeyni koʻrsatish"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Tashqi monitorga oʻtish uchun BIOS tugmalaridan foydalanish"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "XAA oʻrniga EXA'dan foydalanish (Render va Composite uchun yaxshi)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Tizim yuklanayotganda grafik interfeys"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Kompyuter yoqilganda grafik interfeysni (Xorg) ishga tushirish"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -538,318 +543,250 @@ msgstr ""
 "\n"
 "Ushbu imkoniyatdan foydalanishni istaysizmi?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Televizoringiz qaysi formatdan foydalanadi?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "boshqa"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Chexcha (qwertz)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Olmoncha"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Ispancha"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Fincha"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Fransuzcha"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Buyuk Britaniya"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Norvegcha"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Polyakcha"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Ruscha"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Shvedcha"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "AQSH"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albancha"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Armancha (eski)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armancha (yozish moshinasi)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armancha (fonetik)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabcha"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Estoncha"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Ozarbayjoncha (lotin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgiacha"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengalcha (Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengalcha (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bolgarcha (fonetik)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bolgarcha (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brazilcha (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosniyacha"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongxa/Tibetcha"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Beloruscha"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Shveysariya (Olmoncha)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Shveysariya (Fransuzcha)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr ""
-"_: keyboard\n"
-"Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Chexcha (qwertz)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Chexcha (qwerty)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Olmoncha"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Olmoncha (oʻlik tugmalarsiz)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Daniya"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (AQSH)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (Fransuzcha)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (BB)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norvegcha)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polyakcha)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Shvedcha)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estoncha"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Ispancha"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Fincha"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -858,329 +795,369 @@ msgstr ""
 "_: keyboard\n"
 "Faroese"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Fransuzcha"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Fransuzcha"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Grekcha (politonik)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Grekcha (politonik)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Buyuk Britaniya"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gruzincha (rus)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gruzincha (lotin)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Grekcha"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Grekcha (politonik)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmuxi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Xorvatcha"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Vengrcha"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Irlandcha"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Isroilcha"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Isroilcha (fonetik)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Eroncha"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandcha"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Italyancha"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Yaponcha 106 tugma"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Qirgʻizcha"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Koreyscha"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdcha (arabcha yozuv)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Lotin Amerikacha"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laoscha"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Litvacha"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latviacha"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Maori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedoncha"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Birma)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mugʻulcha (kiril)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Malta (Buyuk Britaniya)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Malta (AQSH)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Nigeriyacha"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Gollandcha"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Norvegcha"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Polyakcha (qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Polyakcha (qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pushtu"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugalcha"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanadcha (Kvebek)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumincha (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumincha (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumincha (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Ruscha"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Ruscha (fonetik)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Shvedcha"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovencha"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1189,105 +1166,98 @@ msgstr ""
 "_: keyboard\n"
 "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakcha (qwertz)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakcha (qwerty)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Norvegcha)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (Shvedcha/Fincha)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbcha (kirilcha)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Suriyacha"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Eski Suriyacha (fonetik)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telegu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamilcha (ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamilcha (yozish moshinasi)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Taycha (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Taycha (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Taycha (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1296,7 +1266,7 @@ msgstr ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1305,165 +1275,175 @@ msgstr ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tojikcha"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmancha"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Turkcha (zamonaviy \"Q\" modeli)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Turkcha (zamonaviy \"Q\" modeli)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukraincha"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "AQSH"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "AQSH (xalqaro)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "AQSH (xalqaro)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (har bir tugma uchun 3 darajali US klaviaturasi)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Oʻzbekcha (kiril)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vetnamcha \"raqamli qator\" (qwerty)"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Yugoslavcha (lotin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Oʻng Alt tugmasi"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Bir vaqtda ikkala Shift tugmalari"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Bir vaqtda Ctrl va Shift tugmalari"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock tugmasi"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Bir vaqtda Shift va CapsLock tugmalari"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Bir vaqtda Ctrl va Alt tugmalari"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Bir vaqtda Alt va Shift tugmalari"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menyu\" tugmasi"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Chap \"Windows\" tugmasi"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Oʻng \"Windows\" tugmasi"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Bir vaqtda ikkala Ctrl tugmalari"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Bir vaqtda ikkala Alt tugmalari"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Chap Shift tugmasi"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Oʻng Shift tugmasi"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Chap Alt tugmasi"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Chap Ctrl tugmasi"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Oʻng Ctrl tugmasi"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1474,12 +1454,12 @@ msgstr ""
 "yaratuvchi tugma yoki tugmalar birikmasini tanlashingiz\n"
 "mumkin. (m-n: lotin va lotin emas)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Diqqat"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1490,259 +1470,229 @@ msgstr ""
 "Oʻrnatish vaqtida turli tugmalar tartibini tanlash uchun\n"
 "oʻng \"Ctrl\" tugmasini ishlating."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - sichqoncha"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Andoza"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Gʻildirakli andoza PS2 sichqoncha"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 tugmali"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "2 tugmali andoza sichqoncha"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Gʻildirakni emulyasiya qiladigan andoza uch tugmali sichqoncha"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Gʻildirakli"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "Ketma-ket"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "3 tugmali andoza sichqoncha"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Gʻildirakni emulyasiya qiladigan Logitech MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Gʻilidirakni emulyasiya qiladigan Logitech CC Series"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech sichqoncha (ketma-ket, eski C7 turi)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr ""
 "Gʻildirakni emulyasiya qiladigan Logitech sichqonchasi (seriya portlil, esk "
 "C7 turli)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Gʻildirakni emulyasiya qiladigan Kensington Thinking sichqonchasi"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 tugmali"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 tugmali"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Gʻildirakni emulyasiya qiladigan uch tugmali"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Universal"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Istagan PS/2 va USB sichqoncha"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox sichqonchasi"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware sichqonchasi"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "yoʻq"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Sichqoncha yoʻq"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Sichqoncha tekshirilmoqda"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Iltimos sichqonchaning turini tanlang."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Sichqonchani tanlash"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Uchinchi tugma emulyasiya qilinsinmi?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Sichqonchaning porti"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Iltimos sichqoncha ulangan ketma-ket portini tanlang."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Tugma emulyasiyasi"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Ikkinchi tugmani emulyachiya qilish"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Uchinchi tugmani emulyasiya qilish"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Iltimos sichqonchani sinab koʻring"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Sichqonchani ishga tushirish uchun,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "GʻILDIRAKNI AYLANTIRING!"
@@ -1807,6 +1757,56 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Fransuzcha"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Polyakcha"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Armancha (eski)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - sichqoncha"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox sichqonchasi"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware sichqonchasi"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Tugma emulyasiyasi"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Ikkinchi tugmani emulyachiya qilish"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Uchinchi tugmani emulyasiya qilish"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Turkcha (anʼanaviy \"F\" modeli)"
 
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index bf5fff1..6175b28 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-kbd-mouse-x11-uz\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2009-12-22 21:22+0500\n"
 "Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -64,22 +64,22 @@ msgstr "32 Мб"
 msgid "64 MB or more"
 msgstr "64 Мб ёки кўпроқ"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X сервери"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "График картани танлаш"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Бир неча ядрони созлаш"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -88,12 +88,12 @@ msgstr ""
 "Тизимингиз бир неча ядрони қўллай олада.\n"
 "Нима қилишни истайсиз?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "График картангизни хотирасининг ҳажмини танланг"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -104,7 +104,7 @@ msgstr ""
 "картанинг қўшимча имкониятларидан фойдаланса бўлади.\n"
 "Ундан фойдаланишни истайсизми?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -112,75 +112,75 @@ msgid ""
 msgstr ""
 "Проприетар драйвер тўғри ўрнатилмаган, очиқ кодли дарйвердан фойдаланилади."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Барча ядроларни алоҳида-алоҳида созлаш"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Xinerama кенгайтмасидан фойдаланиш"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Фақат \"%s\"%s картасини мослаш"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Бошқа"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "График карта ва мониторни мослаш"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Чиқиш"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "График карта"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Монитор"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Ўлчам"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Синаш"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Параметрлар"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Плагинлар"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Сизнинг Xorg файлингиз хато, унга эътибор берилмайди."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -193,32 +193,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "#%d ядро учун мониторни танланг"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Мониторни танлаш"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Андоза"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Ишлаб чиқарувчи"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -233,22 +233,22 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Горизонтал яргилаш частотаси"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Вертикал янгилаш частотаси"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Плагинларни танланг"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -263,7 +263,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -276,85 +276,85 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 ранг (8 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 мингта ранг (15 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 мингта ранг (16 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 миллионта ранг (24 бит)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Автоматик"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Ўлчамлар"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Бошқа"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Ўлчам ва ранг чуқурлигини танлаш"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "График карта: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "Ок"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Ёрдам"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Мосламаларни синаб кўриш"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Мосламаларни синаб кўришни истайсизми?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Диққат: бу график картани синаб кўриш компьютерни қотиб қолишига олиб келиши "
 "мумкин"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -365,157 +365,162 @@ msgstr ""
 "%s\n"
 "Баъзи бир параметрларни ўзгартириб синаб кўринг"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d сониядан кейин ёпилади"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Бу тўғрими?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Ctrl-Alt-Backspace ни ўчириш: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "йўқ"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "ҳа"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D тезлаштириш: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Тугмалар тартиби: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Тугмалар тартиби: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Сичқончанинг тури: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Монитор: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Мониторнинг HorizSync: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Мониторнинг VertRefresh: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "График карта: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "График хотиранинг ҳажми: %s Кб\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Ранг чуқурлиги: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Ўлчами: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg драйвери: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg мосламаси"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Умумий параметрлар"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Ctrl-Alt-Backspace ни ўчириш"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "График карта мосламалари"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Шаффофлик имкониятидан фойдаланиш (Composite кенгайтмаси)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Сичқонча кўрсатгичи учун ускуна акселераторидан фойдаланиш"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "Render имкониятидан фойдаланиш (матнни кўрсатишда хато бўлиши мумкин)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "Экранни ташқи моноторда айни нусхасини кўрсатиш"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Иккинчи дисплейда айни шу дисплейни кўрсатиш"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "Ташқи мониторга ўтиш учун BIOS тугмаларидан фойдаланиш"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "XAA ўрнига EXA'дан фойдаланиш (Render ва Composite учун яхши)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Тизим юкланаётганда график интерфейс"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "Компьютер ёқилганда график интерфейсни (Xorg) ишга тушириш"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -536,318 +541,250 @@ msgstr ""
 "\n"
 "Ушбу имкониятдан фойдаланишни истайсизми?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Телевизорингиз қайси форматдан фойдаланади?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "бошқа"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Чехча (qwertz)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Олмонча"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Дворак"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Испанча"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Финча"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Французча"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Буюк Британия"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Норвегча"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Полякча"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Русча"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Шведча"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "АҚШ"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Албанча"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Арманча (эски)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Арманча (ёзиш мошинаси)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Арманча (фонетик)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Арабча"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Эстонча"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Озарбайжонча (лотин)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Белгиача"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Бенгалча (Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Бенгалча (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Болгарча (фонетик)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Болгарча (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Бразилча (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Боснияча"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Дзонгха/Тибетча"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Белорусча"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Швейцария (Олмонча)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Швейцария (Французча)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr ""
-"_: keyboard\n"
-"Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Чехча (qwertz)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Чехча (qwerty)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Олмонча"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Олмонча (ўлик тугмаларсиз)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Деванагари"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Дания"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Дворак (АҚШ)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Дворак (Эсперанто)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Дворак (Французча)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Дворак (ББ)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Дворак (Норвегча)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Дворак (Полякча)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Дворак (Шведча)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Эстонча"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Испанча"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Финча"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -856,329 +793,369 @@ msgstr ""
 "_: keyboard\n"
 "Faroese"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Французча"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Французча"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Грекча (политоник)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Грекча (политоник)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Буюк Британия"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Грузинча (рус)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Грузинча (лотин)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Грекча"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Грекча (политоник)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Гужарати"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Гурмухи"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Хорватча"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Венгрча"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Ирландча"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Инуктитут"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Исроилча"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Исроилча (фонетик)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Эронча"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Исландча"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Италянча"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Японча 106 тугма"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Каннада"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Қирғизча"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Корейсча"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Курдча (арабча ёзув)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Лотин Америкача"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Лаосча"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Литвача"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Латвиача"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Малайалам"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Маори"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Македонча"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Мянмар (Бирма)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Муғулча (кирил)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Малта (Буюк Британия)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Малта (АҚШ)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Нигерияча"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Голландча"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Норвегча"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Ория"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Полякча (qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Полякча (qwertz)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Пушту"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Португалча"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Канадча (Квебек)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Руминча (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Руминча (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Руминча (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Русча"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Русча (фонетик)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Шведча"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Словенча"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1187,105 +1164,98 @@ msgstr ""
 "_: keyboard\n"
 "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Словакча (qwertz)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Словакча (qwerty)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Саами (Норвегча)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Саами (Шведча/Финча)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Синдҳи"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Сербча (кирилча)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Сурияча"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Эски Сурияча (фонетик)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Телегу"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Тамилча (ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Тамилча (ёзиш мошинаси)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Тайча (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Тайча (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Тайча (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1294,7 +1264,7 @@ msgstr ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
@@ -1303,165 +1273,175 @@ msgstr ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Тожикча"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Туркманча"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Туркча (замонавий \"Q\" модели)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Туркча (замонавий \"Q\" модели)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Украинча"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Урду"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "АҚШ"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "АҚШ (халқаро)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "АҚШ (халқаро)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (ҳар бир тугма учун 3 даражали US клавиатураси)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Ўзбекча (кирил)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Ветнамча \"рақамли қатор\" (qwerty)"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Югославча (лотин)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Ўнг Alt тугмаси"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Бир вақтда иккала Shift тугмалари"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Бир вақтда Ctrl ва Shift тугмалари"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock тугмаси"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Бир вақтда Shift ва CapsLock тугмалари"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Бир вақтда Ctrl ва Alt тугмалари"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Бир вақтда Alt ва Shift тугмалари"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Меню\" тугмаси"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Чап \"Windows\" тугмаси"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Ўнг \"Windows\" тугмаси"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Бир вақтда иккала Ctrl тугмалари"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Бир вақтда иккала Alt тугмалари"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Чап Shift тугмаси"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Ўнг Shift тугмаси"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Чап Alt тугмаси"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Чап Ctrl тугмаси"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Ўнг Ctrl тугмаси"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1472,12 +1452,12 @@ msgstr ""
 "яратувчи тугма ёки тугмалар бирикмасини танлашингиз\n"
 "мумкин. (м-н: лотин ва лотин эмас)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Диққат"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1488,259 +1468,229 @@ msgstr ""
 "Ўрнатиш вақтида турли тугмалар тартибини танлаш учун\n"
 "ўнг \"Ctrl\" тугмасини ишлатинг."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - сичқонча"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Андоза"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Ғилдиракли андоза PS2 сичқонча"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 тугмали"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "2 тугмали андоза сичқонча"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Ғилдиракни эмуляция қиладиган андоза уч тугмали сичқонча"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Ғилдиракли"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "Кетма-кет"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "3 тугмали андоза сичқонча"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Ғилдиракни эмуляция қиладиган Logitech MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Ғилидиракни эмуляция қиладиган Logitech CC Series"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech сичқонча (кетма-кет, эски C7 тури)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr ""
 "Ғилдиракни эмуляция қиладиган Logitech сичқончаси (серия портлиl, эск C7 "
 "турли)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Ғилдиракни эмуляция қиладиган Kensington Thinking сичқончаси"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 тугмали"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 тугмали"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Ғилдиракни эмуляция қиладиган уч тугмали"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Универсал"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Истаган PS/2 ва USB сичқонча"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox сичқончаси"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware сичқончаси"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "йўқ"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Сичқонча йўқ"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Сичқонча текширилмоқда"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Илтимос сичқончанинг турини танланг."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Сичқончани танлаш"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Учинчи тугма эмуляция қилинсинми?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Сичқончанинг порти"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Илтимос сичқонча уланган кетма-кет портини танланг."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Тугма эмуляцияси"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Иккинчи тугмани эмулячия қилиш"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Учинчи тугмани эмуляция қилиш"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Илтимос сичқончани синаб кўринг"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Сичқончани ишга тушириш учун,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "ҒИЛДИРАКНИ АЙЛАНТИРИНГ!"
@@ -1804,6 +1754,56 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Дворак"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Французча"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Полякча"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Арманча (эски)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Синдҳи"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - сичқонча"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox сичқончаси"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware сичқончаси"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Тугма эмуляцияси"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Иккинчи тугмани эмулячия қилиш"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Учинчи тугмани эмуляция қилиш"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Туркча (анъанавий \"F\" модели)"
 
diff --git a/po/vi.po b/po/vi.po
index e6a1bf5..ffbe051 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-vi version\n"
 "Report-Msgid-Bugs-To: tmthanh@yahoo.com\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2005-06-02 21:17+0700\n"
 "Last-Translator: Larry Nguyen <larry@vnlinux.org>\n"
 "Language-Team:  <gnomevi-list@lists.sourceforge.net>\n"
@@ -61,22 +61,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB trở lên"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X server"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Chọn X server"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Cấu hình Multi-head"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -85,12 +85,12 @@ msgstr ""
 "Hệ thống của bạn hỗ trợ cấu hình multiple head.\n"
 "Bạn muốn làm gì?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Chọn dung lượng bộ nhớ của card đồ họa"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -98,82 +98,82 @@ msgid ""
 "Do you wish to use it?"
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr ""
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Cấu hình độc lập toàn bộ các head"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Dùng Xinerama mở rộng"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Chỉ cấu hình card \"%s\"%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "Tùy chỉnh"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, fuzzy, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Cấu hình kết nối"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Thoát"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Card Đồ Họa"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Monitor"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Độ phân giải"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Chạy thử"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Các trình bổ sung"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Tập tin cấu hình Xorg bị hỏng, bỏ qua tập tin này."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -186,32 +186,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Chọn màn hình cho đầu #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Chọn monitor"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug 'n' Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Chuẩn chung"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Nhà SX"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -233,22 +233,22 @@ msgstr ""
 "do vậy vượt quá khả năng của màn hình: Bạn có thể làm hỏng màn hình.\n"
 " Nếu không rõ, hãy chọn một thiết lập vừa phải."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Tần số quét ngang"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Tần số quét dọc"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, fuzzy, c-format
 msgid "Choose plugins"
 msgstr "Chọn hành động"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -263,7 +263,7 @@ msgid ""
 "and re-selecting your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -276,83 +276,83 @@ msgid ""
 "manually or reconfigure your graphics card."
 msgstr ""
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 màu (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 nghìn màu (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 nghìn màu (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 triệu màu (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Tự động"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Độ phân giải"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Khác"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Chọn độ phân giải và độ sâu của màu"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Card đồ họa: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "OK"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Bỏ qua"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Chạy thử cấu hình này"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Bạn muốn chạy thử cấu hình này không?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Lưu ý: chạy thử card đồ họa này có thể làm ì máy tính của bạn"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -363,159 +363,164 @@ msgstr ""
 "%s\n"
 "Hãy thử thay đổi một vài tham số"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Rời khỏi sau %d giây"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Đây là thiết lập đúng phải không?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "no"
 msgstr "không có"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, fuzzy, c-format
 msgid "yes"
 msgstr "Có"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Tổ chức bàn phím: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Tổ chức bàn phím: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Loại chuột: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Monitor: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Tần số quét ngang: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Tần số quét dọc: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Card đồ họa: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Bộ nhớ đồ họa: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Độ sâu màu: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Độ phân giải: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg driver: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Cấu hình Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, fuzzy, c-format
 msgid "Global options"
 msgstr "Tùy chọn của module:"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, fuzzy, c-format
 msgid "Graphic card options"
 msgstr "Card đồ họa: %s"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr ""
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Giao diện đồ họa khi khởi động"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, fuzzy, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Có thể đặt chế độ khởi động tự động vào chế độ đồ họa.\n"
 "Bạn có muốn Xorg chạy (đồ họa) khi khởi động lại?"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -535,922 +540,899 @@ msgstr ""
 "\n"
 "Bạn có tính năng này không?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "TV của bạn dùng loại thông thường nào?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "tỷ lệ khác"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Czech (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Đức"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Tây Ban Nha"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Phần lan"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Pháp"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Bàn phím Anh"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Na uy"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Ba lan"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Nga"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Thụy điển"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Bàn phím Mỹ"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albanian"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Mỹ (cổ)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Mỹ (máy chữ)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Mỹ (ngữ âm)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabic"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Estonian"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latin)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Bỉ"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Bengali (Inscript-layout)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Bengali (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bungari (ngữ âm)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bungari (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Braxin (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnian"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Dzongkha/Tibetan"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarusian"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Thụy Sĩ (bàn phím Đức)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Thụy Sĩ (bàn phím Pháp)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Cherokee syllabics"
+"Czech (QWERTZ)"
+msgstr "Czech (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Czech (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Đức"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Đức (không có phím chết)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Đan mạch"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (French)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (UK)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norwegian)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (Polish)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Thụy điển)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonian"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Tây Ban Nha"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Phần lan"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Faroese"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Pháp"
+
+#: ../lib/keyboard.pm:223
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Pháp"
 
-#: ../lib/keyboard.pm:239
+#: ../lib/keyboard.pm:224
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Greek (đa thanh)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Greek (đa thanh)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Bàn phím Anh"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgian (kiểu \"Russian\")"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgian (\"Latin\")"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Hy lạp"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Greek (đa thanh)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croatian"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hungari"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Ailen"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israeli"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israeli (Phonetic)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranian"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Icelandic"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Ý"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Nhật bản 106 phím"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Bàn phím Kyrgyz"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Bàn phím Hàn quốc"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Kurdish (arabic script)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Latin American"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotian"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Iranian"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latvian"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr ""
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedonian"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Miến Điện (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mông Cổ (cyrillic)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltese (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltese (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr ""
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Hà Lan"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Na uy"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Ba Lan (kiểu qwerty)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Ba Lan (qwertz layout)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Pashto"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Bồ Đào Nha"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canada (Quebec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumani (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumani (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Rumani (qwertz)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Nga"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Nga (Phonetic)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Thụy điển"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slovenian"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovakian (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovakian (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (na uy)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (swedish/finnish)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbian (cyrillic)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syriac"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syriac (phonetic)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (ISCII-layout)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (Typewriter-layout)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Thái (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Thái (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Thái (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (moroccan layout) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (phonetic) (+latin/arabic)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tajik keyboard"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Turkmen"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Thổ Nhĩ Kỳ (kiểu hiện đại \"Q\")"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Thổ Nhĩ Kỳ (kiểu hiện đại \"Q\")"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukrainian"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Urdu keyboard"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Bàn phím Mỹ"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Bàn phím Mỹ (quốc tế)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Bàn phím Mỹ (quốc tế)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr ""
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Uzbek (cyrillic)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Việt Nam \"numeric row\" QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Yugoslavian (latin)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Phím Alt phải"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Cả 2 phím Shift đồng thời"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Phím Control và Shift đồng thời"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Phím CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Phím Shift và CapsLock đồng thời"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Phím Ctrl và Alt đồng thời"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Phím Alt và Shift đồng thời "
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Phím \"Menu\""
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Phím \"Windows\" trái"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Phím \"Windows\" phải"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Cả 2 phím Ctrl đồng thời"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Cả 2 phím Alt đồng thời"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Phím Shift trái"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Phím Shift phải"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Phím Alt Trái"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Phím Ctrl trái"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Phím Ctrl phải"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1461,12 +1443,12 @@ msgstr ""
 "qua lại giữa các tổ chức bàn phím khác nhau\n"
 "(VD: latin hay không latin)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1477,257 +1459,227 @@ msgstr ""
 "Trong khi cài đặt, bạn cần dùng phím Control (Ctrl) bên phải\n"
 "để chuyển đổi giữa các tổ chức bàn phím khác nhau."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Chuột của hãng Sun"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Chuẩn"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Generic PS2 Wheel Mouse"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Chuột loại Kensington Thinking"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr " nút 1"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Chuột chuẩn chung 2 nút"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Chuột chuẩn chung 3 nút với mô phỏng bánh xe"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Bánh xe"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "serial"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Chuột chuẩn chung 3 nút"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan với mô phỏng bánh xe"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series với mô phỏng bánh xe"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (serial, old C7 type)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (serial, old C7 type) với mô phỏng bánh xe"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse với mô phỏng bánh xe"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 nút"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 nút"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 nút với mô phỏng bánh xe"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Phổ thông"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Bất kỳ chuột PS/2 và USB nào"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr ""
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox Controller S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr ""
-
-#: ../lib/mouse.pm:90
-#, fuzzy, c-format
-msgid "VMware mouse"
-msgstr "Khác nhau"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "không có"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Không có chuột"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr ""
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Hãy chọn loại chuột."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, fuzzy, c-format
 msgid "Mouse choice"
 msgstr "Lựa chọn thủ công"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Mô phỏng nút thứ ba?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Cổng chuột"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Hãy chọn cổng nối tiếp mà bạn gắn chuột vào."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Mô phỏng các nút"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Mô phỏng nút thứ 2"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Mô phỏng nút 3"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Hãy thử chuột"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Để chuột hoạt động,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "HÃY LĂN CHUỘT!"
@@ -1791,6 +1743,52 @@ msgstr ""
 
 #~ msgid ""
 #~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Pháp"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Ba lan"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Mỹ (cổ)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Cherokee syllabics"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Chuột của hãng Sun"
+
+#, fuzzy
+#~ msgid "VMware mouse"
+#~ msgstr "Khác nhau"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Mô phỏng các nút"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Mô phỏng nút thứ 2"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Mô phỏng nút 3"
+
+#~ msgid ""
+#~ "_: keyboard\n"
 #~ "Turkish (traditional \"F\" model)"
 #~ msgstr "Thổ Nhĩ Kỳ (kiểu truyền thống \"F\")"
 
diff --git a/po/wa.po b/po/wa.po
index b0cba00..1bc022d 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2016-06-27 23:11+0000\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -65,22 +65,22 @@ msgstr "32 Mo"
 msgid "64 MB or more"
 msgstr "64 Mo ou di pus"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "Sierveu X"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "Tchoezixhoz on sierveu X"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Apontiaedje po-z aveur pus d' ene waitroûle"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -90,12 +90,12 @@ msgstr ""
 "waitroûle e minme tins.\n"
 "Cwè voloz vs fé?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Dijhoz li memwere di vosse cåte grafike"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -106,7 +106,7 @@ msgstr ""
 "di pus di fonccionålités.\n"
 "El voloz vs eployî?"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
@@ -114,75 +114,75 @@ msgid ""
 msgstr ""
 "Li mineu prôpietaire n' a nén stî astalé comifåt, dji rmete li libe mineu."
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Apontyî totes les waitroûles sepårumint"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Eployî l' egztension «Xinerama»"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Apontyî rén kel cåte «%s»%s"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "A vosse môde"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "Apontiaedje del cåte grafike et del waitroûle"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "Cwiter"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "Cåte grafike"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "Waitroûle"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "Finté"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "Sayî"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "Tchuzes"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "Tchôke-divins"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Li fitchî d' apontiaedje di Xorg da vosse est cron, dji passe houte."
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -195,32 +195,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Tchoezixhoz l' waitroûle l° %d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Tchoezixhoz ene waitroûle"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "Djenerike"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "Vindeu"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -241,22 +241,22 @@ msgstr ""
 "Ni tchoezixhoz MÅY ene frecwince pus foite ki çki vosse waitroûle sopoite,\n"
 "sins cwè vos pôrîz distrure vosse waitroûle."
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Frecwince di rafristaedje di coûtchî"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Frecwince di rafristaedje d' astampé"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "Tchoezixhoz les tchôke-divins"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -282,7 +282,7 @@ msgstr ""
 "«Apontiaedje do sierveu grafike» di cinte di contrôle di Mageia et rtchoezi "
 "l' cåte grafike da vosse."
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -304,84 +304,84 @@ msgstr ""
 "oister des programes», poy astaler l' pacaedje di firmware oudonbén rapontyî "
 "l' mineu del cåte grafike da vosse."
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 coleurs (8 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "32 meye coleurs (15 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "65 meye coleurs (16 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "16 miyons di coleurs (24 bits)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "Otomatike"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "Fintés"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "Ôte"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Tchoezixhoz li finté et li parfondeu di coleur"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Cåte grafike: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "'l est bon"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "Rinoncî"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "Aidance"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "Saye di l' apontiaedje"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "Voloz vs sayî l' apontiaedje?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr ""
 "Loukîz a vos: sayî cisse cåte grafike chal pout djaler vosse copiutrece"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -392,163 +392,168 @@ msgstr ""
 "%s\n"
 "Sayîz di candjî sacwants parametes"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Dji va cwiter dins %d segondes"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Est çki c' est l' apontiaedje corek?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "Dismete Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "neni"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "oyi"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "Acceleråcion 3D d' éndjolreye: %s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "Sôre del taprece: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "Sôre del taprece: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "Sôre di sori: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "Waitroûle: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "Frecwince di coûtchî del waitroûle: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "Frecwince d' astampé del waitroûle: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "Cåte grafike: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "Memwere del cåte: %s Ko\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "Parfondeu di coleur: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "Fintés: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Mineu di Xorg: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Apontiaedje di Xorg"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "Tchuzes globåles"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "Dismete Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "Tchuzes del cåte grafike"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "Mete en alaedje li voeyaedje hoûte (egztinsion composite)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "Eployî ene sori avou acceleråcion d' éndjolreye"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr ""
 "Mete en alaedje l' acceleråcion RENDER (çoula pout fé des bugs sol håynaedje "
 "di tecse)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr ""
 "Mete en alaedje li duplicaedje di håynaedje so ene difoûtrinne waitroûle"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "Mete en alaedje li duplicaedje di håynaedje so ene deujhinme waitroûle"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "Foircî l' môde di håynaedje DVI"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr ""
 "Mete en alaedje tape rascourti pol discandje di håynaedje so ene difoûtrinne "
 "waitroûle"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "Eployî EXA purade ki XAA (ça va mî po Render eyet Composite)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "Enonder X a l' enondaedje"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr ""
 "Enondaedje dins l' môde grafike (dizo X) do côp ki l' éndjole s' enonde."
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -570,922 +575,899 @@ msgstr ""
 "\n"
 "Voloz vs sopoirter cisse possibilité?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "Kéne nôrme fåt i eployî po vosse TV?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "ôte"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "Taprece tcheke (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "Taprece almande"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Taprece dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "Taprece espagnole"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "Taprece finwesse"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "Taprece francesse"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "Taprece do Rweyåme Uni"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "Taprece norvedjinne"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "Taprece polonesse"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "Taprece Rûsse"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "Taprece suwedwesse"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "Taprece des Estats Unis"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Taprece albanyinne"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "Taprece årmenyinne (viye modêye)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Taprece årmenyinne (novele modêye)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Taprece årmenyinne (fonetike)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Taprece arabe"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "Taprece asturyinne"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Taprece azerbaydjanesse (latene)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Taprece bedje"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "Taprece bengalesse (adjinçmint «Inscript»)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "Taprece bengalesse (adjinçmint «Probhat»)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Taprece bulgåre (fonetike)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Taprece bulgåre (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Taprece braezilyinne (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Taprece bosnyinne"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "Taprece tibetinne"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Taprece bielorûsse"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Taprece swisse (cogne tîxhone)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Taprece swisse (cogne romande)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "Taprece tcherokî"
+"Czech (QWERTZ)"
+msgstr "Taprece tcheke (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Taprece tcheke (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "Taprece almande"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Taprece almande (sins moitès tapes)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Taprece indyinne (Devanagari)"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Taprece daenwesse"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Taprece dvorak (US)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Taprece dvorak esperanto"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Taprece dvorak francesse"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Taprece dvorak (GB)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Taprece dvorak norvedjinne"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Taprece dvorak polonesse"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Taprece dvorak suwedwesse"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Taprece estonyinne"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "Taprece espagnole"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "Taprece finwesse"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "Taprece faeroyesse"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "Taprece francesse (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "Taprece francesse (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "Taprece francesse (Bepo, latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "Taprece francesse (Bepo, latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "Taprece do Rweyåme Uni"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Taprece djeyordjyinne (cogne rûsse)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Taprece djeyordjyinne (cogne latene)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Taprece greke"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Taprece greke (politonike)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Taprece indyinne (Goudjarati)"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Taprece indyinne (Gourmouxhi)"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Taprece crowåte"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Taprece hongrwesse"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Taprece irlandesse"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Taprece inuktitut"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Taprece israyelyinne"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Taprece israyelyinne (fonetike)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Taprece iranyinne"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Taprece izlandesse"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Taprece itålyinne"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Taprece djaponesse di 106 tapes"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Taprece indyinne (Kannada)"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Taprece kirguize"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Taprece corêyinne"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "Taprece kurde (sicrijhaedje arabe)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Taprece di l' Amerike nonnrece"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Taprece lawocyinne"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "Taprece litwanyinne"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Taprece letone"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Taprece malayalam"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "Taprece mawori"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Taprece macedonyinne"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Taprece birmande"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Taprece mongole (cirilike)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Taprece maltesse (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Taprece maltesse (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "Taprece nidjeryinne"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Taprece neyerlandesse"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "Taprece norvedjinne"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Taprece indyinne (Oriya)"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Taprece polonesse (cogne QWERTY)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Taprece polonesse (cogne QWERTZ)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "Taprece pashto (sicrijhaedje arabe)"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Taprece portuguesse"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Taprece canadyinne (Québec)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Taprece roumine (QWERTZ)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Taprece roumine (QWERTY)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "Taprece rouminne (di båze)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "Taprece Rûsse"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Taprece rûsse (fonetike)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "Taprece suwedwesse"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Taprece eslovenyinne"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Taprece sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Taprece eslovake (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Taprece eslovake (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Taprece såmi (norvedjinne)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Taprece såmi (suwedwesse/finlandesse)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Taprece sindhi (sicrijhaedje arabe)"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Taprece siebe (cirilike)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Taprece siriake"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Taprece siriake (fonetike)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Taprece telougou"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Taprece tamoule (adjinçmint ISCII)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Taprece tamoule (adjinçmint «taprece mecanike»)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "Taprece taylandesse (kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "Taprece taylandesse (tis-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "Taprece taylandesse (pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Taprece tifinar (marokinne) (+latén/arabe)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Taprece tifinar (fonetike) (+latén/arabe)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Taprece tadjike"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "Taprece turcmene"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "Taprece turke (cogne wårdiveuse «F»)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "Taprece turke (cogne modiene «Q»)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Taprece oucrinnyinne"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "Taprece ourdou"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "Taprece des Estats Unis"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Taprece des Estats Unis (moitès tapes)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "Taprece des Estats Unis (moitès tapes)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "Taprece ISO9995-3 (taprece US a 3 liveas)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Taprece ouzbeke (cirilike)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Taprece vietnamyinne QWERTY (roye des limeros)"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Taprece yougoslave (latene)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "Li tape AltGr"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Les deus tapes di Shift e minme tins"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control eyet Shift e minme tins"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "Li tape CapsLock"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Control eyet CapsLock e minme tins"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Control eyet Alt e minme tins"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt eyet Shift e minme tins"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Li tape «Menu»"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Li tape «Windows» di hintche"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Li tape «Windows» di droete"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Les deus tapes Control e minme tins"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Les deus tapes Alt e minme tins"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "Li tape Shift di hintche"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "Li tape Shift di droete"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "Li tape Alt di hintche"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "Li tape Control di hintche"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "Li tape Control di droete"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1496,12 +1478,12 @@ msgstr ""
 "vos vôrîz eployî po candjî d' ene taprece a l' ôte\n"
 "(eg: d' ene taprece e letes latenes a ene nén latene)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "Adviertixhmint"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1512,257 +1494,227 @@ msgstr ""
 "Tins d' l' astalåcion, vos dvroz eployî li tape Control di droete\n"
 "po discandjî inte les diferinnès sôres di taprece."
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sori SUN"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "Tipike"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "Sori tipike PS2 a rôlete"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "1 boton"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Sori tipike a 2 botons"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "Sori tipike a 3 botons avou rôlete emulêye"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "Rôlete"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "séreye"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "Sori tipike a 3 botons"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "Logitech MouseMan avou rôlete emulêye"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "Mouse Systems"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC Series"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "Logitech CC Series avou rôlete emulêye"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (séreye, viye sôre C7)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "Logitech Mouse (séreye, viye sôre C7) avou rôlete emulêye"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse avou rôlete emulêye"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "sori bus"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "2 botons"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "3 botons"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "Sori a troes botons avou rôlete emulêye"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "Univiersele"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "Tot l' minme kéne sori PS/2 ou USB"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "Foircî evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox controleu-S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "Sori VirtualBox"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "Sori VMware"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "nouk"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "Nole sori"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "Saye del sori"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Tchoezixhoz li sôre di vosse sori."
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "Tchoezixhaedje del sori"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "Emuler li troejhinme boton?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "Pôrt del sori"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Tchoezixhoz li pôrt séreye ki vosse sori est raloyeye dizo."
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "Emulåcion des botons"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "Emulåcion do 2inme boton"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "Emulåcion do 3inme boton"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "Sayîz on pô vosse sori"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "Po mete en alaedje li sori,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "BODJÎZ L' RÔLETE!"
@@ -1821,3 +1773,51 @@ msgstr "Enonder l' apontiaedje del cåte grafike da Mageia"
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr ""
 "I vs fåt otintifyî po-z enonder l' apontiaedje del cåte grafike da Mageia"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Taprece dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "Taprece francesse"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "Taprece polonesse"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "Taprece årmenyinne (viye modêye)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "Taprece tcherokî"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Taprece sindhi (sicrijhaedje arabe)"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sori SUN"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "Sori VirtualBox"
+
+#~ msgid "VMware mouse"
+#~ msgstr "Sori VMware"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "Emulåcion des botons"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "Emulåcion do 2inme boton"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "Emulåcion do 3inme boton"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a2d2ce8..1ebd70a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2017-04-17 09:22+0000\n"
 "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
@@ -66,22 +66,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB 或更多"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X 服务器"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "选择 X 服务器"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "多显示器配置"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -90,12 +90,12 @@ msgstr ""
 "您的系统支持多显示器。\n"
 "是否进行设置?"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "请选择您显示卡上内存的大小"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -105,82 +105,82 @@ msgstr ""
 "您的显示卡可使用私有驱动程序，这样可以支持额外的特性。\n"
 "您是否想要使用私有驱动程序？"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr "私有驱动程序未正确安装，默认使用自由软件驱动程序。"
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "独立配置所有头"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "使用 Xinerama 扩展"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "只配置“%s”%s 卡"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "自定义"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "显示卡和显示器配置"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "退出"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "显示卡"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "显示器"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "分辨率"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "测试"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "选项"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "插件"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "您的 Xorg 配置文件已经损坏, 我们将会忽略该文件。"
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -193,32 +193,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "选择显示头 %d 的显示器"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "选择显示器"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "即插即用"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "通用"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "厂家"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -240,22 +240,22 @@ msgstr ""
 "不恰当的设置可能会损害您的显示器！\n"
 "所以没把握时, 您可以选择保守的设置。"
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "水平刷新率"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "垂直刷新率"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "选择插件"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -277,7 +277,7 @@ msgstr ""
 "要启用完整的显卡支持，请在“安装和移除软件”选项中启用“nonfree”仓库，并在 "
 "Mageia 控制中心的“设置图形服务器”选项中重新选择显卡并配置它。"
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -295,83 +295,83 @@ msgstr ""
 "要启用完整的显卡支持，请在“安装和移除软件”选项中启用“nonfree”仓库，并在 "
 "Mageia 控制中心的“设置图形服务器”选项中重新选择显卡并配置它。"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 色(8 位)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "3 万 2 千色(15 位)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "6 万 5 千色(16 位)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "1 千 6 百万色(24 位)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "自动"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "分辨率"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "其它"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "选择屏幕分辨率以及颜色深度"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "显示卡: %s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "测试配置"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "您想要测试您的配置吗?"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "警告: 测试这个图形卡可能会锁定您的电脑"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -382,157 +382,162 @@ msgstr ""
 "%s\n"
 "试着更改某些参数"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "即将于 %d 秒后离开"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "设置正确吗?"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "禁用 Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "无"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "是"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D 硬件加速：%s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "键盘布局: %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "键盘布局: %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "鼠标类型: %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "显示器: %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "显示器水平刷新率: %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "显示器垂直刷新率: %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "显示卡: %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "显存: %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "颜色深度: %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "分辨率: %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg 驱动程序: %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg 配置"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "全局选项"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "禁用 Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "显示卡选项"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "启用透明(Composite 扩展)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "使用硬件加速的鼠标指针"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "启用渲染加速(可能导致文本显示出错)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "允许在外部显示器上复制显示"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "允许在第二台显示器上复制显示"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "强制 DVI 显示的模式"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "允许使用 BIOS 热键进行外接显示器切换"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "使用 EXA 取代 XAA(渲染和组合的性能更好)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "启动时进入图形界面"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "启动时自动启动图形界面(Xorg)"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -552,922 +557,899 @@ msgstr ""
 "\n"
 "您是否要使用此特性?"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "您的电视信号是什么制式?"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "其它"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "捷克(QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "德国"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "西班牙"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "芬兰"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "法国"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "英国"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "挪威"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "波兰"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "俄国"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "瑞典语"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "美国键盘"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "阿尔巴尼亚"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "美国(老式)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "美国(打字机)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "美国(音标)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "阿拉伯"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "阿斯图里亚斯"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "阿塞拜疆(拉丁)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "比利时"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "孟加拉(Inscript)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "孟加拉(Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "保加利亚(音标)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "保加利亚(BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "巴西(ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "波斯尼亚"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "藏语"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "白俄罗斯"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "瑞士(德语布局)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "瑞士(法语布局)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "切诺基(音节)"
+"Czech (QWERTZ)"
+msgstr "捷克(QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "捷克(QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "德国"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "德国(没有 dead keys)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "梵文"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "丹麦"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak(美国)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak(世界语)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak(法国)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak(英国)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak(挪威)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak(波兰)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak(瑞典)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "爱沙尼亚"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "西班牙"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "芬兰"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "法罗语"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "法国(Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "法国(Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "法国(Bepo，仅 latin-9 字符)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "法国(Bepo，仅 latin-9 字符)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "英国"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "格鲁吉亚(“俄语”布局)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "格鲁吉亚(“拉丁”布局)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "希腊"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "希腊语(polytonic)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "古吉拉特"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "旁遮普"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "克罗地亚"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "匈牙利"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "爱尔兰"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "因纽特"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "以色列"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "以色列(音标)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "伊朗"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "冰岛"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "意大利"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "日文 106 键盘"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "埃纳德"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kyrgyz 键盘"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "韩国键盘"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "库尔德语(阿拉伯)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "拉丁美洲"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "老挝"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "立陶宛"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "拉脱维亚"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "德拉维"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "毛利"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "马其顿"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "缅甸"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "蒙古(西里尔)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "马耳他(英国)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "马耳他(美国)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "尼日利亚"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "荷兰"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "挪威"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "奥里雅"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "波兰(QWERTY 布局)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "波兰(QWERTZ 布局)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "普什图语"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "葡萄牙语"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "加拿大(魁北克)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "罗马尼亚(QWERTZ 布局)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "罗马尼亚(QWERTY 布局)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "罗马尼亚(基本)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "俄国"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "俄语(音标)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "瑞典语"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "斯洛文尼亚"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "Sinhala"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "斯洛伐克(QWERTZ 布局)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "斯洛伐克(QWERTY 布局)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami(挪威)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "北部沙米语(瑞典/芬兰)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "Sindhi"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "赛尔维亚(西里尔字母)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "叙利亚"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "叙利亚(音标)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "泰卢固"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "泰米尔(ISCII-布局)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "泰米尔(打字机布局)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "泰国语(Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "泰国语(TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "泰国语(Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "Tifinagh (摩洛哥布局)(+拉丁/阿拉伯语)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "Tifinagh (音标)(+拉丁/阿拉伯语)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "塔吉克"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "土库曼语"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "土耳其（“F”型）"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "土耳其（“Q”型）"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "乌克兰"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "乌尔都键盘"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "美国键盘"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "美国键盘(国际)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "美国键盘(国际)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (美国键盘，每个按键带三个级别)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "乌兹别克(西里尔)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "越南键盘“顺排”QWERTY"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "南斯拉夫(拉丁)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "右边的 ALT 键"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "同时按两个 Shift 键"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "同时按 Ctrl 和 Shift 键"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock 键"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "同时按 Shift 和 CapsLock 键"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "同时按 Ctrl 和 Alt 键"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "同时按 Alt 和 Shift 键"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "“菜单”键"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "左侧“Windows”键"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "右侧“Windows”键"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "同时按两个 Ctrl 键"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "同时按两个 Alt 键"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "左侧 Shift 键"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "右侧 Shift 键"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "左侧的 Alt 键"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "左侧 Ctrl 键"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "右侧 Ctrl 键"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1478,12 +1460,12 @@ msgstr ""
 "来在不同的键盘布局之间切换\n"
 "(例如, 英文和中文)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1493,257 +1475,227 @@ msgstr ""
 "此设置将会在安装后激活。\n"
 "在安装过程中, 您需要使用右侧的 Ctrl 键切换不同的键盘布局。"
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - 鼠标"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "标准"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "罗技 MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "普通 PS2 滚轮鼠标"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "单键"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "普通两键鼠标"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "普通 3 键鼠标, 模拟滚轮"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "滚轮"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "串行"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "普通 3 键鼠标"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "微软智能鼠标"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "罗技 MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "罗技 MouseMan, 模拟滚轮"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "鼠标系统"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "罗技 CC 系列"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "罗技 CC 系列, 模拟滚轮"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "罗技 MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "罗技鼠标(串口, 旧 C7 型)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "罗技鼠标(串口, 旧 C7 型), 模拟滚轮"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "Kensington Thinking Mouse, 模拟滚轮"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "两键"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "三键"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "3 键, 模拟滚轮"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "通用"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "任何 PS/2 或 USB 鼠标"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "强制 evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox 控制器 S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox 鼠标"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware 鼠标"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "无"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "无鼠标"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "测试鼠标"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "请选择您的鼠标类型。"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "鼠标选择"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "模拟三键吗?"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "鼠标端口"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "请选择您的鼠标是连接到那个串行口。"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "模拟按键"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "模拟第二键"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "模拟第三键"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "请测试您的鼠标"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "要激活鼠标,"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "请移动您的滚轮！"
@@ -1801,3 +1753,51 @@ msgstr "运行 Mageia 图形配置"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "需要进行认证以运行 Mageia 图形配置"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "法国"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "波兰"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "美国(老式)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "切诺基(音节)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "Sindhi"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - 鼠标"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox 鼠标"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware 鼠标"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "模拟按键"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "模拟第二键"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "模拟第三键"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 1e14fbe..4ed70c5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2016-06-15 21:57+0200\n"
+"POT-Creation-Date: 2019-05-13 21:52+0300\n"
 "PO-Revision-Date: 2018-12-10 06:38+0000\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/MageiaLinux/mageia/"
@@ -63,22 +63,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB 或者更多"
 
-#: ../lib/Xconfig/card.pm:176
+#: ../lib/Xconfig/card.pm:163
 #, c-format
 msgid "X server"
 msgstr "X 伺服器"
 
-#: ../lib/Xconfig/card.pm:177
+#: ../lib/Xconfig/card.pm:164
 #, c-format
 msgid "Choose an X server"
 msgstr "選取一個 X 伺服器"
 
-#: ../lib/Xconfig/card.pm:208
+#: ../lib/Xconfig/card.pm:195
 #, c-format
 msgid "Multi-head configuration"
 msgstr "多顯示器輸出端設定"
 
-#: ../lib/Xconfig/card.pm:209
+#: ../lib/Xconfig/card.pm:196
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -87,12 +87,12 @@ msgstr ""
 "您的系統支援多顯示器輸出端設定組態。\n"
 "您打算怎麼做呢？"
 
-#: ../lib/Xconfig/card.pm:298
+#: ../lib/Xconfig/card.pm:285
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "選擇顯示卡上的記憶體大小"
 
-#: ../lib/Xconfig/card.pm:323
+#: ../lib/Xconfig/card.pm:310
 #, c-format
 msgid ""
 "There is a proprietary driver available for your video card which may "
@@ -101,82 +101,82 @@ msgid ""
 msgstr ""
 "您的顯示卡有專利的驅動程式可以使用，也許能支援其他功能。您想要使用它嗎？"
 
-#: ../lib/Xconfig/card.pm:355
+#: ../lib/Xconfig/card.pm:342
 #, c-format
 msgid ""
 "The proprietary driver was not properly installed, defaulting to free "
 "software driver."
 msgstr "這個專利的驅動程式沒有妥善的安裝，預設使用自由的驅動程式。"
 
-#: ../lib/Xconfig/card.pm:425
+#: ../lib/Xconfig/card.pm:413
 #, c-format
 msgid "Configure all heads independently"
 msgstr "獨立設定所有顯示器輸出端"
 
-#: ../lib/Xconfig/card.pm:426
+#: ../lib/Xconfig/card.pm:414
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "使用 Xinerama 全景延伸顯示"
 
-#: ../lib/Xconfig/card.pm:431
+#: ../lib/Xconfig/card.pm:419
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "僅設定 \"%s\"%s 顯示卡"
 
-#: ../lib/Xconfig/main.pm:92 ../lib/Xconfig/main.pm:93
-#: ../lib/Xconfig/monitor.pm:114
+#: ../lib/Xconfig/main.pm:93 ../lib/Xconfig/main.pm:94
+#: ../lib/Xconfig/monitor.pm:116
 #, c-format
 msgid "Custom"
 msgstr "自訂"
 
-#: ../lib/Xconfig/main.pm:127
+#: ../lib/Xconfig/main.pm:128
 #, c-format
 msgid "Graphic Card & Monitor Configuration"
 msgstr "顯示卡與螢幕組態設定"
 
-#: ../lib/Xconfig/main.pm:128
+#: ../lib/Xconfig/main.pm:129
 #, c-format
 msgid "Quit"
 msgstr "離開"
 
-#: ../lib/Xconfig/main.pm:130
+#: ../lib/Xconfig/main.pm:131
 #, c-format
 msgid "Graphic Card"
 msgstr "顯示卡"
 
-#: ../lib/Xconfig/main.pm:133 ../lib/Xconfig/monitor.pm:108
+#: ../lib/Xconfig/main.pm:134 ../lib/Xconfig/monitor.pm:110
 #, c-format
 msgid ""
 "_: This is a display device\n"
 "Monitor"
 msgstr "螢幕"
 
-#: ../lib/Xconfig/main.pm:136 ../lib/Xconfig/resolution_and_depth.pm:344
+#: ../lib/Xconfig/main.pm:137 ../lib/Xconfig/resolution_and_depth.pm:347
 #, c-format
 msgid "Resolution"
 msgstr "解析度"
 
-#: ../lib/Xconfig/main.pm:139
+#: ../lib/Xconfig/main.pm:140
 #, c-format
 msgid "Test"
 msgstr "測試"
 
-#: ../lib/Xconfig/main.pm:144
+#: ../lib/Xconfig/main.pm:145
 #, c-format
 msgid "Options"
 msgstr "選項"
 
-#: ../lib/Xconfig/main.pm:149
+#: ../lib/Xconfig/main.pm:150
 #, c-format
 msgid "Plugins"
 msgstr "外掛程式"
 
-#: ../lib/Xconfig/main.pm:183
+#: ../lib/Xconfig/main.pm:184
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "您的 Xorg 設定檔已損毀，我們將忽略它。"
 
-#: ../lib/Xconfig/main.pm:201
+#: ../lib/Xconfig/main.pm:202
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -189,32 +189,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "選取一個螢幕給顯示輸出端 #%d"
 
-#: ../lib/Xconfig/monitor.pm:109
+#: ../lib/Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "選取一個螢幕"
 
-#: ../lib/Xconfig/monitor.pm:115
+#: ../lib/Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "隨插即用"
 
-#: ../lib/Xconfig/monitor.pm:116 ../lib/mouse.pm:48
+#: ../lib/Xconfig/monitor.pm:118 ../lib/mouse.pm:41
 #, c-format
 msgid "Generic"
 msgstr "一般"
 
-#: ../lib/Xconfig/monitor.pm:117
+#: ../lib/Xconfig/monitor.pm:119
 #, c-format
 msgid "Vendor"
 msgstr "廠商"
 
-#: ../lib/Xconfig/monitor.pm:135
+#: ../lib/Xconfig/monitor.pm:137
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -236,22 +236,22 @@ msgstr ""
 "同步範圍的螢幕：您可能傷害您的螢幕。\n"
 "若您不確定的話，請選擇保守一點的設定值。"
 
-#: ../lib/Xconfig/monitor.pm:142
+#: ../lib/Xconfig/monitor.pm:144
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "水平更新頻率"
 
-#: ../lib/Xconfig/monitor.pm:143
+#: ../lib/Xconfig/monitor.pm:145
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "垂直更新頻率"
 
-#: ../lib/Xconfig/plugins.pm:219
+#: ../lib/Xconfig/plugins.pm:221
 #, c-format
 msgid "Choose plugins"
 msgstr "選取 plugin"
 
-#: ../lib/Xconfig/proprietary.pm:61
+#: ../lib/Xconfig/proprietary.pm:63
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -274,7 +274,7 @@ msgstr ""
 "後到 Mageia 控制中心的「設定圖形伺服器」並重新選擇顯示卡來重新設定顯示卡驅動"
 "程式。"
 
-#: ../lib/Xconfig/proprietary.pm:69
+#: ../lib/Xconfig/proprietary.pm:71
 #, c-format
 msgid ""
 "The free '%s' driver for your graphics card requires a proprietary firmware "
@@ -291,83 +291,83 @@ msgstr ""
 "要稍後啟用所有顯示卡的功能，請在「安裝和移除軟體」中啟用「nonfree」套件來源，"
 "然後手動安裝軔體或重新設定您的顯示卡。"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:11
+#: ../lib/Xconfig/resolution_and_depth.pm:12
 #, c-format
 msgid "256 colors (8 bits)"
 msgstr "256 色 (8 位元)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:12
+#: ../lib/Xconfig/resolution_and_depth.pm:13
 #, c-format
 msgid "32 thousand colors (15 bits)"
 msgstr "3 萬 2 千色 (15 位元)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:13
+#: ../lib/Xconfig/resolution_and_depth.pm:14
 #, c-format
 msgid "65 thousand colors (16 bits)"
 msgstr "6 萬 5 千色 (16 位元)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:14
+#: ../lib/Xconfig/resolution_and_depth.pm:15
 #, c-format
 msgid "16 million colors (24 bits)"
 msgstr "1 千 6 百萬色 (24 位元)"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:51
-#: ../lib/Xconfig/resolution_and_depth.pm:335 ../lib/mouse.pm:36
+#: ../lib/Xconfig/resolution_and_depth.pm:52
+#: ../lib/Xconfig/resolution_and_depth.pm:338 ../lib/mouse.pm:29
 #, c-format
 msgid "Automatic"
 msgstr "自動"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:109
+#: ../lib/Xconfig/resolution_and_depth.pm:112
 #, c-format
 msgid "Resolutions"
 msgstr "解析度"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:367 ../lib/mouse.pm:513
+#: ../lib/Xconfig/resolution_and_depth.pm:370 ../lib/mouse.pm:475
 #, c-format
 msgid "Other"
 msgstr "其他"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:419
+#: ../lib/Xconfig/resolution_and_depth.pm:422
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "選取解析度以及顏色深度"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:420
+#: ../lib/Xconfig/resolution_and_depth.pm:423
 #, c-format
 msgid "Graphics card: %s"
 msgstr "顯示卡：%s"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../lib/Xconfig/resolution_and_depth.pm:434
+#: ../lib/Xconfig/resolution_and_depth.pm:437
 #, c-format
 msgid "Help"
 msgstr "輔助說明"
 
-#: ../lib/Xconfig/test.pm:30
+#: ../lib/Xconfig/test.pm:31
 #, c-format
 msgid "Test of the configuration"
 msgstr "設定值測試"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Do you want to test the configuration?"
 msgstr "您想要測試設定值嗎？"
 
-#: ../lib/Xconfig/test.pm:31
+#: ../lib/Xconfig/test.pm:32
 #, c-format
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "警告：測試這張顯示卡時可能會使您的系統停止回應"
 
-#: ../lib/Xconfig/test.pm:65
+#: ../lib/Xconfig/test.pm:66
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -378,157 +378,162 @@ msgstr ""
 "%s\n"
 "請試著改變某些參數"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "%d 秒後離開"
 
-#: ../lib/Xconfig/test.pm:126
+#: ../lib/Xconfig/test.pm:128
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "這是正確的設定值嗎？"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace: %s\n"
 msgstr "不使用 Ctrl-Alt-Backspace: %s\n"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "no"
 msgstr "否"
 
-#: ../lib/Xconfig/various.pm:26
+#: ../lib/Xconfig/various.pm:27
 #, c-format
 msgid "yes"
 msgstr "是"
 
-#: ../lib/Xconfig/various.pm:27
+#: ../lib/Xconfig/various.pm:28
 #, c-format
 msgid "3D hardware acceleration: %s\n"
 msgstr "3D 硬體加速：%s\n"
 
-#: ../lib/Xconfig/various.pm:28
+#: ../lib/Xconfig/various.pm:29
 #, c-format
 msgid "Keyboard layout: %s\n"
 msgstr "鍵盤形式： %s\n"
 
-#: ../lib/Xconfig/various.pm:29
+#: ../lib/Xconfig/various.pm:30
+#, fuzzy, c-format
+msgid "Keyboard variant: %s\n"
+msgstr "鍵盤形式： %s\n"
+
+#: ../lib/Xconfig/various.pm:31
 #, c-format
 msgid "Mouse type: %s\n"
 msgstr "滑鼠種類： %s\n"
 
-#: ../lib/Xconfig/various.pm:31
+#: ../lib/Xconfig/various.pm:33
 #, c-format
 msgid "Monitor: %s\n"
 msgstr "螢幕： %s\n"
 
-#: ../lib/Xconfig/various.pm:32
+#: ../lib/Xconfig/various.pm:34
 #, c-format
 msgid "Monitor HorizSync: %s\n"
 msgstr "螢幕水平更新頻率： %s\n"
 
-#: ../lib/Xconfig/various.pm:33
+#: ../lib/Xconfig/various.pm:35
 #, c-format
 msgid "Monitor VertRefresh: %s\n"
 msgstr "螢幕垂直更新頻率： %s\n"
 
-#: ../lib/Xconfig/various.pm:35
+#: ../lib/Xconfig/various.pm:37
 #, c-format
 msgid "Graphics card: %s\n"
 msgstr "顯示卡： %s\n"
 
-#: ../lib/Xconfig/various.pm:36
+#: ../lib/Xconfig/various.pm:38
 #, c-format
 msgid "Graphics memory: %s kB\n"
 msgstr "顯示卡記憶體： %s kB\n"
 
-#: ../lib/Xconfig/various.pm:38
+#: ../lib/Xconfig/various.pm:40
 #, c-format
 msgid "Color depth: %s\n"
 msgstr "色深： %s\n"
 
-#: ../lib/Xconfig/various.pm:39
+#: ../lib/Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
 msgstr "解析度： %s\n"
 
-#: ../lib/Xconfig/various.pm:41
+#: ../lib/Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
 msgstr "Xorg 驅動程式： %s\n"
 
-#: ../lib/Xconfig/various.pm:245
+#: ../lib/Xconfig/various.pm:251
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg 設定"
 
-#: ../lib/Xconfig/various.pm:246
+#: ../lib/Xconfig/various.pm:252
 #, c-format
 msgid "Global options"
 msgstr "全域選項"
 
-#: ../lib/Xconfig/various.pm:247
+#: ../lib/Xconfig/various.pm:253
 #, c-format
 msgid "Disable Ctrl-Alt-Backspace"
 msgstr "停用 Ctrl-Alt-Backspace"
 
-#: ../lib/Xconfig/various.pm:249
+#: ../lib/Xconfig/various.pm:255
 #, c-format
 msgid "Graphic card options"
 msgstr "顯示卡選項"
 
-#: ../lib/Xconfig/various.pm:250
+#: ../lib/Xconfig/various.pm:256
 #, c-format
 msgid "Enable Translucency (Composite extension)"
 msgstr "啟用半透明特效 (Composite extension)"
 
-#: ../lib/Xconfig/various.pm:253
+#: ../lib/Xconfig/various.pm:259
 #, c-format
 msgid "Use hardware accelerated mouse pointer"
 msgstr "使用硬體加速滑鼠游標"
 
-#: ../lib/Xconfig/various.pm:256
+#: ../lib/Xconfig/various.pm:262
 #, c-format
 msgid "Enable RENDER Acceleration (this may cause bugs displaying text)"
 msgstr "啟用 RENDER 加速 (這可能會在顯示文字時導致臭蟲)"
 
-#: ../lib/Xconfig/various.pm:260
+#: ../lib/Xconfig/various.pm:266
 #, c-format
 msgid "Enable duplicate display on the external monitor"
 msgstr "在外接螢幕上啟用同步顯示"
 
-#: ../lib/Xconfig/various.pm:261
+#: ../lib/Xconfig/various.pm:267
 #, c-format
 msgid "Enable duplicate display on the second display"
 msgstr "在第二顯示器上啟用同步顯示"
 
-#: ../lib/Xconfig/various.pm:264
+#: ../lib/Xconfig/various.pm:270
 #, c-format
 msgid "Force display mode of DVI"
 msgstr "強制 DVI 顯示模式"
 
-#: ../lib/Xconfig/various.pm:267
+#: ../lib/Xconfig/various.pm:273
 #, c-format
 msgid "Enable BIOS hotkey for external monitor switching"
 msgstr "啟用 BIOS 熱鍵來切換外部顯示器"
 
-#: ../lib/Xconfig/various.pm:270
+#: ../lib/Xconfig/various.pm:276
 #, c-format
 msgid "Use EXA instead of XAA (better performance for Render and Composite)"
 msgstr "使用 EXA 取代 XAA (對 Render 與 Composite 有較好的效能)"
 
-#: ../lib/Xconfig/various.pm:272
+#: ../lib/Xconfig/various.pm:278
 #, c-format
 msgid "Graphical interface at startup"
 msgstr "開機時啟動圖形介面"
 
-#: ../lib/Xconfig/various.pm:273
+#: ../lib/Xconfig/various.pm:279
 #, c-format
 msgid "Automatically start the graphical interface (Xorg) upon booting"
 msgstr "開機時自動啟動圖形介面 (Xorg)"
 
-#: ../lib/Xconfig/various.pm:285
+#: ../lib/Xconfig/various.pm:291
 #, c-format
 msgid ""
 "Your graphic card seems to have a TV-OUT connector.\n"
@@ -548,922 +553,899 @@ msgstr ""
 "\n"
 "您要使用這項功能嗎？"
 
-#: ../lib/Xconfig/various.pm:297
+#: ../lib/Xconfig/various.pm:303
 #, c-format
 msgid "What norm is your TV using?"
 msgstr "您的電視用什麼標準？"
 
-#: ../lib/Xconfig/xfree.pm:765
+#: ../lib/Xconfig/xfree.pm:776
 #, c-format
 msgid ""
 "_:weird aspect ratio\n"
 "other"
 msgstr "其他"
 
-#: ../lib/keyboard.pm:187 ../lib/keyboard.pm:220
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Czech (QWERTZ)"
-msgstr "捷克 (QWERTZ)"
-
-#: ../lib/keyboard.pm:188 ../lib/keyboard.pm:222
-#, c-format
-msgid ""
-"_: keyboard\n"
-"German"
-msgstr "德語"
-
-#: ../lib/keyboard.pm:189
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Dvorak"
-msgstr "Dvorak 配置"
-
-#: ../lib/keyboard.pm:190 ../lib/keyboard.pm:234
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Spanish"
-msgstr "西班牙"
-
-#: ../lib/keyboard.pm:191 ../lib/keyboard.pm:235
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Finnish"
-msgstr "芬蘭"
-
-#: ../lib/keyboard.pm:192 ../lib/keyboard.pm:237
-#, c-format
-msgid ""
-"_: keyboard\n"
-"French"
-msgstr "法語"
-
-#: ../lib/keyboard.pm:193 ../lib/keyboard.pm:240
-#, c-format
-msgid "UK keyboard"
-msgstr "英式鍵盤"
-
-#: ../lib/keyboard.pm:194 ../lib/keyboard.pm:279
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Norwegian"
-msgstr "挪威"
-
-#: ../lib/keyboard.pm:195
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Polish"
-msgstr "波蘭"
-
-#: ../lib/keyboard.pm:196 ../lib/keyboard.pm:290
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Russian"
-msgstr "俄羅斯"
-
-#: ../lib/keyboard.pm:197 ../lib/keyboard.pm:292
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Swedish"
-msgstr "瑞典"
-
-#: ../lib/keyboard.pm:198 ../lib/keyboard.pm:327
-#, c-format
-msgid "US keyboard"
-msgstr "美式鍵盤"
-
-#: ../lib/keyboard.pm:200
+#: ../lib/keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "阿爾巴尼亞"
 
-#: ../lib/keyboard.pm:201
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Armenian (old)"
-msgstr "亞美尼亞 (舊式)"
-
-#: ../lib/keyboard.pm:202
+#: ../lib/keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "亞美尼亞 (打字機)"
 
-#: ../lib/keyboard.pm:203
+#: ../lib/keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "亞美尼亞 (音標)"
 
-#: ../lib/keyboard.pm:204
+#: ../lib/keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "阿拉伯"
 
-#: ../lib/keyboard.pm:205
+#: ../lib/keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Asturian"
 msgstr "阿斯圖里亞斯語"
 
-#: ../lib/keyboard.pm:206
+#: ../lib/keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (拉丁)"
 
-#: ../lib/keyboard.pm:207
+#: ../lib/keyboard.pm:192
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "比利時"
 
-#: ../lib/keyboard.pm:208
+#: ../lib/keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Inscript-layout)"
 msgstr "孟加拉 (Inscript 式配置)"
 
-#: ../lib/keyboard.pm:209
+#: ../lib/keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bengali (Probhat)"
 msgstr "孟加拉 (Probhat)"
 
-#: ../lib/keyboard.pm:210
+#: ../lib/keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "保加利亞 (音標)"
 
-#: ../lib/keyboard.pm:211
+#: ../lib/keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "保加利亞 (BDS)"
 
-#: ../lib/keyboard.pm:212
+#: ../lib/keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "巴西 (ABNT-2)"
 
-#: ../lib/keyboard.pm:213
+#: ../lib/keyboard.pm:198
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "波士尼亞"
 
-#: ../lib/keyboard.pm:214
+#: ../lib/keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dzongkha/Tibetan"
 msgstr "不丹宗卡語/藏語"
 
-#: ../lib/keyboard.pm:215
+#: ../lib/keyboard.pm:200
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "白俄羅斯"
 
-#: ../lib/keyboard.pm:216
+#: ../lib/keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "瑞士 (德式配置)"
 
-#: ../lib/keyboard.pm:217
+#: ../lib/keyboard.pm:202
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "瑞士 (法式配置)"
 
-#: ../lib/keyboard.pm:219
+#: ../lib/keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Cherokee syllabics"
-msgstr "卻洛奇族語"
+"Czech (QWERTZ)"
+msgstr "捷克 (QWERTZ)"
 
-#: ../lib/keyboard.pm:221
+#: ../lib/keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "捷克 (QWERTY)"
 
-#: ../lib/keyboard.pm:223
+#: ../lib/keyboard.pm:207
+#, c-format
+msgid ""
+"_: keyboard\n"
+"German"
+msgstr "德語"
+
+#: ../lib/keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "德語 (無 dead keys)"
 
-#: ../lib/keyboard.pm:224
+#: ../lib/keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "梵文"
 
-#: ../lib/keyboard.pm:225
+#: ../lib/keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "丹麥語"
 
-#: ../lib/keyboard.pm:226
+#: ../lib/keyboard.pm:211
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (美式)"
 
-#: ../lib/keyboard.pm:227
+#: ../lib/keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (世界語)"
 
-#: ../lib/keyboard.pm:228
+#: ../lib/keyboard.pm:213
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (French)"
 msgstr "Dvorak (法式)"
 
-#: ../lib/keyboard.pm:229
+#: ../lib/keyboard.pm:214
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (UK)"
 msgstr "Dvorak (英式)"
 
-#: ../lib/keyboard.pm:230
+#: ../lib/keyboard.pm:215
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (挪威)"
 
-#: ../lib/keyboard.pm:231
+#: ../lib/keyboard.pm:216
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Polish)"
 msgstr "Dvorak (波蘭)"
 
-#: ../lib/keyboard.pm:232
+#: ../lib/keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (瑞典)"
 
-#: ../lib/keyboard.pm:233
+#: ../lib/keyboard.pm:218
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "愛沙尼亞"
 
-#: ../lib/keyboard.pm:236
+#: ../lib/keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Spanish"
+msgstr "西班牙"
+
+#: ../lib/keyboard.pm:220
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Finnish"
+msgstr "芬蘭"
+
+#: ../lib/keyboard.pm:221
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Faroese"
 msgstr "法羅語"
 
-#: ../lib/keyboard.pm:238
+#: ../lib/keyboard.pm:222
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty standard)"
+msgstr "法語 (Bepo)"
+
+#: ../lib/keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French (Bepo)"
 msgstr "法語 (Bepo)"
 
-#: ../lib/keyboard.pm:239
-#, c-format
+#: ../lib/keyboard.pm:224
+#, fuzzy, c-format
 msgid ""
 "_: keyboard\n"
-"French (Bepo, only latin-9)"
+"French (Bepo latin9)"
 msgstr "法語 (Bepo, 僅 latin-9)"
 
-#: ../lib/keyboard.pm:241
+#: ../lib/keyboard.pm:225
+#, fuzzy, c-format
+msgid ""
+"_: keyboard\n"
+"French (Azerty latin9)"
+msgstr "法語 (Bepo, 僅 latin-9)"
+
+#: ../lib/keyboard.pm:226
+#, c-format
+msgid "UK keyboard"
+msgstr "英式鍵盤"
+
+#: ../lib/keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "喬治亞 (\"俄式\" 配置)"
 
-#: ../lib/keyboard.pm:242
+#: ../lib/keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "喬治亞 (\"拉丁式\" 配置)"
 
-#: ../lib/keyboard.pm:243
+#: ../lib/keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "希臘"
 
-#: ../lib/keyboard.pm:244
+#: ../lib/keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "希臘 (多音調)"
 
-#: ../lib/keyboard.pm:245
+#: ../lib/keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "古吉拉特語"
 
-#: ../lib/keyboard.pm:246
+#: ../lib/keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "古爾穆希語"
 
-#: ../lib/keyboard.pm:247
+#: ../lib/keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "克羅埃西亞"
 
-#: ../lib/keyboard.pm:248
+#: ../lib/keyboard.pm:234
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "匈牙利"
 
-#: ../lib/keyboard.pm:249
+#: ../lib/keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "愛爾蘭"
 
-#: ../lib/keyboard.pm:250
+#: ../lib/keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "伊努克梯圖語"
 
-#: ../lib/keyboard.pm:251
+#: ../lib/keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "以色列"
 
-#: ../lib/keyboard.pm:252
+#: ../lib/keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "以色列 (音標)"
 
-#: ../lib/keyboard.pm:253
+#: ../lib/keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "伊朗"
 
-#: ../lib/keyboard.pm:254
+#: ../lib/keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "冰島"
 
-#: ../lib/keyboard.pm:255
+#: ../lib/keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "義大利"
 
-#: ../lib/keyboard.pm:259
+#: ../lib/keyboard.pm:245
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "日本 106 鍵"
 
-#: ../lib/keyboard.pm:260
+#: ../lib/keyboard.pm:246
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "坎納達語"
 
-#: ../lib/keyboard.pm:261
+#: ../lib/keyboard.pm:247
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "吉爾吉斯語"
 
-#: ../lib/keyboard.pm:262
+#: ../lib/keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "韓式鍵盤"
 
-#: ../lib/keyboard.pm:264
+#: ../lib/keyboard.pm:250
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kurdish (arabic script)"
 msgstr "庫德語 (arabic script)"
 
-#: ../lib/keyboard.pm:265
+#: ../lib/keyboard.pm:251
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "拉丁美洲"
 
-#: ../lib/keyboard.pm:267
+#: ../lib/keyboard.pm:253
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "寮國"
 
-#: ../lib/keyboard.pm:268
+#: ../lib/keyboard.pm:254
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian"
 msgstr "立陶宛"
 
-#: ../lib/keyboard.pm:269
+#: ../lib/keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "拉托維亞"
 
-#: ../lib/keyboard.pm:270
+#: ../lib/keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "馬拉雅拉姆語"
 
-#: ../lib/keyboard.pm:271
+#: ../lib/keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maori"
 msgstr "毛利語"
 
-#: ../lib/keyboard.pm:272
+#: ../lib/keyboard.pm:258
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "馬其頓語"
 
-#: ../lib/keyboard.pm:273
+#: ../lib/keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "緬甸語 (Burmese)"
 
-#: ../lib/keyboard.pm:274
+#: ../lib/keyboard.pm:260
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "蒙古語 (cyrillic)"
 
-#: ../lib/keyboard.pm:275
+#: ../lib/keyboard.pm:261
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "馬爾他語 (UK)"
 
-#: ../lib/keyboard.pm:276
+#: ../lib/keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "馬爾他語 (US)"
 
-#: ../lib/keyboard.pm:277
+#: ../lib/keyboard.pm:263
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Nigerian"
 msgstr "尼日"
 
-#: ../lib/keyboard.pm:278
+#: ../lib/keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "荷蘭"
 
-#: ../lib/keyboard.pm:280
+#: ../lib/keyboard.pm:265
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Norwegian"
+msgstr "挪威"
+
+#: ../lib/keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "奧里雅語"
 
-#: ../lib/keyboard.pm:281
+#: ../lib/keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "波蘭 (qwerty 式配置)"
 
-#: ../lib/keyboard.pm:282
+#: ../lib/keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "波蘭 (qwertz 式配置)"
 
-#: ../lib/keyboard.pm:284
+#: ../lib/keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Pashto"
 msgstr "帕施圖語"
 
-#: ../lib/keyboard.pm:285
+#: ../lib/keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "葡萄牙"
 
-#: ../lib/keyboard.pm:286
+#: ../lib/keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "加拿大 (魁北克)"
 
-#: ../lib/keyboard.pm:287
+#: ../lib/keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "羅馬尼亞 (qwertz)"
 
-#: ../lib/keyboard.pm:288
+#: ../lib/keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "羅馬尼亞 (qwerty)"
 
-#: ../lib/keyboard.pm:289
+#: ../lib/keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (basic)"
 msgstr "羅馬尼亞 (基本)"
 
-#: ../lib/keyboard.pm:291
+#: ../lib/keyboard.pm:276
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Russian"
+msgstr "俄羅斯"
+
+#: ../lib/keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "俄羅斯 (音標)"
 
-#: ../lib/keyboard.pm:293
+#: ../lib/keyboard.pm:278
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Swedish"
+msgstr "瑞典"
+
+#: ../lib/keyboard.pm:279
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "斯洛伐尼亞"
 
-#: ../lib/keyboard.pm:295
+#: ../lib/keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Sinhala"
 msgstr "僧伽羅語"
 
-#: ../lib/keyboard.pm:296
+#: ../lib/keyboard.pm:282
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "斯洛伐克 (QWERTZ)"
 
-#: ../lib/keyboard.pm:297
+#: ../lib/keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "斯洛伐克 (QWERTY)"
 
-#: ../lib/keyboard.pm:298
+#: ../lib/keyboard.pm:284
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "薩米語 (挪威)"
 
-#: ../lib/keyboard.pm:299
+#: ../lib/keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "薩米語 (瑞典/芬蘭)"
 
-#: ../lib/keyboard.pm:301
-#, c-format
-msgid ""
-"_: keyboard\n"
-"Sindhi"
-msgstr "信德語"
-
-#: ../lib/keyboard.pm:303
+#: ../lib/keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "塞爾維亞 (cyrillic)"
 
-#: ../lib/keyboard.pm:304
+#: ../lib/keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "敘利亞"
 
-#: ../lib/keyboard.pm:305
+#: ../lib/keyboard.pm:291
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "敘利亞 (音標)"
 
-#: ../lib/keyboard.pm:306
+#: ../lib/keyboard.pm:292
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "泰盧固語"
 
-#: ../lib/keyboard.pm:308
+#: ../lib/keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "坦米爾 (ISCII-佈置)"
 
-#: ../lib/keyboard.pm:309
+#: ../lib/keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "坦米爾 (打字機配置)"
 
-#: ../lib/keyboard.pm:310
+#: ../lib/keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Kedmanee)"
 msgstr "泰語鍵盤 (Kedmanee)"
 
-#: ../lib/keyboard.pm:311
+#: ../lib/keyboard.pm:297
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (TIS-820)"
 msgstr "泰語鍵盤 (TIS-820)"
 
-#: ../lib/keyboard.pm:313
+#: ../lib/keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Thai (Pattachote)"
 msgstr "泰語鍵盤 (Pattachote)"
 
-#: ../lib/keyboard.pm:315
+#: ../lib/keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (moroccan layout) (+latin/arabic)"
 msgstr "提非納語 (摩洛哥配置) (+拉丁/阿拉伯)"
 
-#: ../lib/keyboard.pm:316
+#: ../lib/keyboard.pm:302
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tifinagh (phonetic) (+latin/arabic)"
 msgstr "提非納語 (音標) (+拉丁/阿拉伯)"
 
-#: ../lib/keyboard.pm:318
+#: ../lib/keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "塔吉克語"
 
-#: ../lib/keyboard.pm:320
+#: ../lib/keyboard.pm:306
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkmen"
 msgstr "土庫曼語"
 
-#: ../lib/keyboard.pm:321
+#: ../lib/keyboard.pm:307
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"F\" model)"
 msgstr "土耳其 (\"F\"型)"
 
-#: ../lib/keyboard.pm:322
+#: ../lib/keyboard.pm:308
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (\"Q\" model)"
 msgstr "土耳其 (\"Q\"型)"
 
-#: ../lib/keyboard.pm:324
+#: ../lib/keyboard.pm:310
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "烏克蘭"
 
-#: ../lib/keyboard.pm:326
+#: ../lib/keyboard.pm:312
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Urdu keyboard"
 msgstr "烏都語鍵盤"
 
-#: ../lib/keyboard.pm:328
+#: ../lib/keyboard.pm:313
+#, c-format
+msgid "US keyboard"
+msgstr "美式鍵盤"
+
+#: ../lib/keyboard.pm:314
 #, c-format
 msgid "US keyboard (international)"
 msgstr "美式鍵盤 (國際型)"
 
-#: ../lib/keyboard.pm:329
+#: ../lib/keyboard.pm:315
+#, fuzzy, c-format
+msgid "US keyboard (Macintosh)"
+msgstr "美式鍵盤 (國際型)"
+
+#: ../lib/keyboard.pm:316
 #, c-format
 msgid "ISO9995-3 (US keyboard with 3 levels per key)"
 msgstr "ISO9995-3 (每個按鍵有三階的美式鍵盤)"
 
-#: ../lib/keyboard.pm:330
+#: ../lib/keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "烏茲別克 (cyrillic)"
 
-#: ../lib/keyboard.pm:332
+#: ../lib/keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "越南 \"數字列\" QWERTY 式"
 
-#: ../lib/keyboard.pm:333
+#: ../lib/keyboard.pm:320
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "南斯拉夫 (拉丁)"
 
-#: ../lib/keyboard.pm:340
+#: ../lib/keyboard.pm:326
 #, c-format
 msgid "Right Alt key"
 msgstr "右方 Alt 按鍵"
 
-#: ../lib/keyboard.pm:341
+#: ../lib/keyboard.pm:327
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "同時兩邊 Shift 按鍵"
 
-#: ../lib/keyboard.pm:342
+#: ../lib/keyboard.pm:328
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Control 與 Shift 鍵同時"
 
-#: ../lib/keyboard.pm:343
+#: ../lib/keyboard.pm:329
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock 按鍵"
 
-#: ../lib/keyboard.pm:344
+#: ../lib/keyboard.pm:330
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift 與 CapsLock 鍵同時"
 
-#: ../lib/keyboard.pm:345
+#: ../lib/keyboard.pm:331
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl 與 Alt 鍵同時"
 
-#: ../lib/keyboard.pm:346
+#: ../lib/keyboard.pm:332
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt 與 Shift 鍵同時"
 
-#: ../lib/keyboard.pm:347
+#: ../lib/keyboard.pm:333
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"選單\" 按鍵"
 
-#: ../lib/keyboard.pm:348
+#: ../lib/keyboard.pm:334
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "左邊 \"Windows\" 按鍵"
 
-#: ../lib/keyboard.pm:349
+#: ../lib/keyboard.pm:335
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "右邊 \"Windows\" 按鍵"
 
-#: ../lib/keyboard.pm:350
+#: ../lib/keyboard.pm:336
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "同時兩邊 Control 按鍵"
 
-#: ../lib/keyboard.pm:351
+#: ../lib/keyboard.pm:337
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "同時兩邊 Alt 按鍵"
 
-#: ../lib/keyboard.pm:352
+#: ../lib/keyboard.pm:338
 #, c-format
 msgid "Left Shift key"
 msgstr "左邊 Shift 按鍵"
 
-#: ../lib/keyboard.pm:353
+#: ../lib/keyboard.pm:339
 #, c-format
 msgid "Right Shift key"
 msgstr "右邊 Shift 按鍵"
 
-#: ../lib/keyboard.pm:354
+#: ../lib/keyboard.pm:340
 #, c-format
 msgid "Left Alt key"
 msgstr "左邊 Alt 按鍵"
 
-#: ../lib/keyboard.pm:355
+#: ../lib/keyboard.pm:341
 #, c-format
 msgid "Left Control key"
 msgstr "左邊 Control 按鍵"
 
-#: ../lib/keyboard.pm:356
+#: ../lib/keyboard.pm:342
 #, c-format
 msgid "Right Control key"
 msgstr "右邊 Control 按鍵"
 
-#: ../lib/keyboard.pm:392
+#: ../lib/keyboard.pm:379
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -1473,12 +1455,12 @@ msgstr ""
 "請選擇按鍵或組合鍵, 以便於快速的切換不同的鍵盤配置\n"
 "(eg: 拉丁與非拉丁)"
 
-#: ../lib/keyboard.pm:397
+#: ../lib/keyboard.pm:384
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../lib/keyboard.pm:398
+#: ../lib/keyboard.pm:385
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -1488,257 +1470,227 @@ msgstr ""
 "這個設定會在安裝完成後啟動。在安裝過程時，您將需要使用右邊 Control\n"
 "鍵在各種不同的鍵盤配置之間切換。"
 
-#: ../lib/mouse.pm:26
-#, c-format
-msgid "Sun - Mouse"
-msgstr "Sun - 滑鼠"
-
-#: ../lib/mouse.pm:32
+#: ../lib/mouse.pm:25
 #, c-format
 msgid "Standard"
 msgstr "標準"
 
-#: ../lib/mouse.pm:33
+#: ../lib/mouse.pm:26
 #, c-format
 msgid "Logitech MouseMan+"
 msgstr "Logitech MouseMan+"
 
-#: ../lib/mouse.pm:34
+#: ../lib/mouse.pm:27
 #, c-format
 msgid "Generic PS2 Wheel Mouse"
 msgstr "一般 PS/2 滾輪滑鼠"
 
-#: ../lib/mouse.pm:35
+#: ../lib/mouse.pm:28
 #, c-format
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: ../lib/mouse.pm:38 ../lib/mouse.pm:72
+#: ../lib/mouse.pm:31 ../lib/mouse.pm:65
 #, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:39 ../lib/mouse.pm:67
+#: ../lib/mouse.pm:32 ../lib/mouse.pm:60
 #, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../lib/mouse.pm:40
+#: ../lib/mouse.pm:33
 #, c-format
 msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
-#: ../lib/mouse.pm:41 ../lib/mouse.pm:51
+#: ../lib/mouse.pm:34 ../lib/mouse.pm:44
 #, c-format
 msgid "Microsoft Explorer"
 msgstr "Microsoft Explorer"
 
-#: ../lib/mouse.pm:46 ../lib/mouse.pm:78
+#: ../lib/mouse.pm:39
 #, c-format
 msgid "1 button"
 msgstr "單鍵式"
 
-#: ../lib/mouse.pm:47 ../lib/mouse.pm:56
+#: ../lib/mouse.pm:40 ../lib/mouse.pm:49
 #, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "一般的兩鍵式滑鼠"
 
-#: ../lib/mouse.pm:49 ../lib/mouse.pm:58
+#: ../lib/mouse.pm:42 ../lib/mouse.pm:51
 #, c-format
 msgid "Generic 3 Button Mouse with Wheel emulation"
 msgstr "一般的三鍵式滑鼠有滾輪模擬"
 
-#: ../lib/mouse.pm:50
+#: ../lib/mouse.pm:43
 #, c-format
 msgid "Wheel"
 msgstr "滾輪"
 
-#: ../lib/mouse.pm:54
+#: ../lib/mouse.pm:47
 #, c-format
 msgid "serial"
 msgstr "序列"
 
-#: ../lib/mouse.pm:57
+#: ../lib/mouse.pm:50
 #, c-format
 msgid "Generic 3 Button Mouse"
 msgstr "一般的三鍵式滑鼠"
 
-#: ../lib/mouse.pm:59
+#: ../lib/mouse.pm:52
 #, c-format
 msgid "Microsoft IntelliMouse"
 msgstr "Microsoft IntelliMouse"
 
-#: ../lib/mouse.pm:60
+#: ../lib/mouse.pm:53
 #, c-format
 msgid "Logitech MouseMan"
 msgstr "Logitech MouseMan"
 
-#: ../lib/mouse.pm:61
+#: ../lib/mouse.pm:54
 #, c-format
 msgid "Logitech MouseMan with Wheel emulation"
 msgstr "有滾輪模擬的 Logitech MouseMan"
 
-#: ../lib/mouse.pm:62
+#: ../lib/mouse.pm:55
 #, c-format
 msgid "Mouse Systems"
 msgstr "滑鼠系統"
 
-#: ../lib/mouse.pm:64
+#: ../lib/mouse.pm:57
 #, c-format
 msgid "Logitech CC Series"
 msgstr "Logitech CC 系列"
 
-#: ../lib/mouse.pm:65
+#: ../lib/mouse.pm:58
 #, c-format
 msgid "Logitech CC Series with Wheel emulation"
 msgstr "有滾輪模擬的 Logitech CC Series"
 
-#: ../lib/mouse.pm:66
+#: ../lib/mouse.pm:59
 #, c-format
 msgid "Logitech MouseMan+/FirstMouse+"
 msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../lib/mouse.pm:68
+#: ../lib/mouse.pm:61
 #, c-format
 msgid "MM Series"
 msgstr "MM Series"
 
-#: ../lib/mouse.pm:69
+#: ../lib/mouse.pm:62
 #, c-format
 msgid "MM HitTablet"
 msgstr "MM HitTablet"
 
-#: ../lib/mouse.pm:70
+#: ../lib/mouse.pm:63
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type)"
 msgstr "Logitech Mouse (序列式，舊 C7 型)"
 
-#: ../lib/mouse.pm:71
+#: ../lib/mouse.pm:64
 #, c-format
 msgid "Logitech Mouse (serial, old C7 type) with Wheel emulation"
 msgstr "有滾輪模擬的 Logitech Mouse (serial, old C7 type)"
 
-#: ../lib/mouse.pm:73
+#: ../lib/mouse.pm:66
 #, c-format
 msgid "Kensington Thinking Mouse with Wheel emulation"
 msgstr "有滾輪模擬的 Kensington Thinking Mouse"
 
-#: ../lib/mouse.pm:76
+#: ../lib/mouse.pm:69
 #, c-format
 msgid "busmouse"
 msgstr "busmouse"
 
-#: ../lib/mouse.pm:79
+#: ../lib/mouse.pm:72
 #, c-format
 msgid "2 buttons"
 msgstr "兩個按鍵"
 
-#: ../lib/mouse.pm:80
+#: ../lib/mouse.pm:73
 #, c-format
 msgid "3 buttons"
 msgstr "三個按鍵"
 
-#: ../lib/mouse.pm:81
+#: ../lib/mouse.pm:74
 #, c-format
 msgid "3 buttons with Wheel emulation"
 msgstr "有滾輪模擬的三個按鍵"
 
-#: ../lib/mouse.pm:84
+#: ../lib/mouse.pm:77
 #, c-format
 msgid "Universal"
 msgstr "通用"
 
-#: ../lib/mouse.pm:86
+#: ../lib/mouse.pm:79
 #, c-format
 msgid "Any PS/2 & USB mice"
 msgstr "任何 PS/2 與 USB 滑鼠"
 
-#: ../lib/mouse.pm:87
+#: ../lib/mouse.pm:80
 #, c-format
 msgid "Force evdev"
 msgstr "強制使用 evdev"
 
-#: ../lib/mouse.pm:88
+#: ../lib/mouse.pm:81
 #, c-format
 msgid "Microsoft Xbox Controller S"
 msgstr "Microsoft Xbox 控制器 S"
 
-#: ../lib/mouse.pm:89
-#, c-format
-msgid "VirtualBox mouse"
-msgstr "VirtualBox 滑鼠"
-
-#: ../lib/mouse.pm:90
-#, c-format
-msgid "VMware mouse"
-msgstr "VMware 滑鼠"
-
-#: ../lib/mouse.pm:93
+#: ../lib/mouse.pm:84
 #, c-format
 msgid "none"
 msgstr "無"
 
-#: ../lib/mouse.pm:95
+#: ../lib/mouse.pm:86
 #, c-format
 msgid "No mouse"
 msgstr "無滑鼠"
 
-#: ../lib/mouse.pm:488
+#: ../lib/mouse.pm:450
 #, c-format
 msgid "Testing the mouse"
 msgstr "測試滑鼠"
 
-#: ../lib/mouse.pm:525
+#: ../lib/mouse.pm:487
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "請選擇您的滑鼠類型。"
 
-#: ../lib/mouse.pm:526
+#: ../lib/mouse.pm:488
 #, c-format
 msgid "Mouse choice"
 msgstr "選擇滑鼠"
 
-#: ../lib/mouse.pm:542
+#: ../lib/mouse.pm:504
 #, c-format
 msgid "Emulate third button?"
 msgstr "模擬第三鍵？"
 
-#: ../lib/mouse.pm:546
+#: ../lib/mouse.pm:508
 #, c-format
 msgid "Mouse Port"
 msgstr "滑鼠連接埠"
 
-#: ../lib/mouse.pm:547
+#: ../lib/mouse.pm:509
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "請選取您滑鼠連接的序列埠。"
 
-#: ../lib/mouse.pm:556
-#, c-format
-msgid "Buttons emulation"
-msgstr "按鍵模擬"
-
-#: ../lib/mouse.pm:558
-#, c-format
-msgid "Button 2 Emulation"
-msgstr "模擬第二鍵"
-
-#: ../lib/mouse.pm:559
-#, c-format
-msgid "Button 3 Emulation"
-msgstr "模擬第三鍵"
-
-#: ../lib/mouse.pm:610
+#: ../lib/mouse.pm:562
 #, c-format
 msgid "Please test the mouse"
 msgstr "請測試滑鼠"
 
-#: ../lib/mouse.pm:612
+#: ../lib/mouse.pm:564
 #, c-format
 msgid "To activate the mouse,"
 msgstr "為了驅動您的滑鼠，"
 
-#: ../lib/mouse.pm:613
+#: ../lib/mouse.pm:565
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "請滾動您的滾輪！"
@@ -1796,3 +1748,51 @@ msgstr "執行 Mageia 圖形設定"
 #: ../polkit/org.mageia.drakx11.policy.in.h:2
 msgid "Authentication is required to run Mageia Graphics Configuration"
 msgstr "執行 Mageia 圖形設定需要認證"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Dvorak"
+#~ msgstr "Dvorak 配置"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "French"
+#~ msgstr "法語"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Polish"
+#~ msgstr "波蘭"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Armenian (old)"
+#~ msgstr "亞美尼亞 (舊式)"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Cherokee syllabics"
+#~ msgstr "卻洛奇族語"
+
+#~ msgid ""
+#~ "_: keyboard\n"
+#~ "Sindhi"
+#~ msgstr "信德語"
+
+#~ msgid "Sun - Mouse"
+#~ msgstr "Sun - 滑鼠"
+
+#~ msgid "VirtualBox mouse"
+#~ msgstr "VirtualBox 滑鼠"
+
+#~ msgid "VMware mouse"
+#~ msgstr "VMware 滑鼠"
+
+#~ msgid "Buttons emulation"
+#~ msgstr "按鍵模擬"
+
+#~ msgid "Button 2 Emulation"
+#~ msgstr "模擬第二鍵"
+
+#~ msgid "Button 3 Emulation"
+#~ msgstr "模擬第三鍵"