Update translation catalog

1 files changed, 381 insertions, 381 deletions

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)"