Update translation catalog

1 files changed, 381 insertions, 381 deletions

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\" модел)"